Dev

app/build.gradle

@@ -1,14 +1,29 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath 'io.fabric.tools:gradle:1.+'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
+
+repositories {
+    maven { url 'https://maven.fabric.io/public' }
+}
+
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId "net.bluehack.kiosk"
         minSdkVersion 17
-        targetSdkVersion 24
-        versionCode 0
-        versionName "0.1"
+        targetSdkVersion 25
+        versionCode 3
+        versionName "0.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -17,26 +32,36 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    useLibrary 'org.apache.http.legacy'
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         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.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:cardview-v7:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
     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.google.firebase:firebase-auth:10.0.1'
     compile 'com.squareup:otto:1.3.7'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile 'noman.placesapi:placesAPI:1.1.3'
+    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
     testCompile 'junit:junit:4.12'
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+        transitive = true;
+    }
+    compile "org.apache.httpcomponents:httpclient-android:4.3.3"
+    compile 'com.mcxiaoke.volley:library:1.0.19'
+    compile 'io.swagger:swagger-annotations:1.5.13'
+    compile 'com.belladati:httpclientandroidlib:4.3.0'
+    compile 'com.tsengvn:Typekit:1.0.0'
+    compile 'com.google.android.gms:play-services-analytics:10.0.1'
 }
 
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'

app/google-services.json

@@ -26,7 +26,10 @@
       ],
       "services": {
         "analytics_service": {
-          "status": 1
+          "status": 1,
+          "analytics_property": {
+            "tracking_id": "UA-99305451-1"
+          }
         },
         "appinvite_service": {
           "status": 1,

app/src/main/AndroidManifest.xml

@@ -2,69 +2,108 @@
 <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"
-        android:allowBackup="false"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/app_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <!--google map-->
         <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyA7av6NBZ3U-CwHzYMPex2M96OWP1zQz4Y"/>
+            android:name="com.google.android.gms.analytics.globalConfigResource"
+            android:resource="@xml/global_tracker" />
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
+        <receiver
+            android:name=".api.net.NetworkChangeReceiver"
+            android:label="NetworkChangeReceiver">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name=".notification.firebase.FirebasePushReceiver">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+        <service android:name=".notification.firebase.FirebaseTokenService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
+            </intent-filter>
+        </service>
+
         <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" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".store.StoreActivity"
-            android:label="@string/app_title"
-            android:screenOrientation="portrait">
-        </activity>
-
+            android:label="@string/tool_bar_store"
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name=".order.OrderActivity"
-            android:label="@string/app_title"
-            android:screenOrientation="portrait">
-        </activity>
-
+            android:name=".myinfo.MyInfoActivity"
+            android:label="@string/tool_bar_myinfo"
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name=".order_pay.OrderPayActivity"
-            android:label="@string/app_title"
-            android:screenOrientation="portrait">
-        </activity>
-
+            android:name=".subcategory.SubCategoryActivity"
+            android:label="@string/tool_bar_subcategory"
+            android:screenOrientation="portrait"></activity>
         <activity
-            android:name=".order_option.OrderOptionActivity"
-            android:label="@string/app_title"
-            android:screenOrientation="portrait">
-        </activity>
+            android:name=".menu.MenuActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".menu.option.MenuOptionActivity"
+            android:label="@string/tool_bar_menu_option"
+            android:screenOrientation="portrait"></activity>
 
         <activity
-            android:name=".process.ProcessActivity"
-            android:label="@string/app_title"
-            android:screenOrientation="portrait">
-        </activity>
+            android:name=".cart.CartMenuActivity"
+            android:label="@string/tool_bar_cart_menu"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".home.HomeActivity"
+            android:label="@string/tool_bar_home"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".home.ticket.TicketActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".history.HistoryActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".contact.ContactActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".payment.PaymentActivity"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".payment.PaymentWebView"
+            android:screenOrientation="portrait"></activity>
+        <activity
+            android:name=".popup.CompletedStatusPopup"
+            android:theme="@android:style/Theme.Dialog" />
+        <activity
+            android:name=".login.AdminActivity"
+            android:screenOrientation="portrait"></activity>
 
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="3afc70e7b1ed28fb9da0479acd74fd4ab58b93b4" />
     </application>
 
 </manifest>