Merged gedemo branch to devOfflineCapability branch.

app/build.gradle

@@ -14,9 +14,8 @@ repositories {
     maven { url 'https://maven.fabric.io/public' }
 }
 
-apply plugin: 'android-apt'
-
 android {
+    flavorDimensions "tier"
     signingConfigs {
         config {
             keyAlias 'Uofl'
@@ -34,7 +33,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
-        versionName "0.0.29"
+        versionName "0.0.30"
         multiDexEnabled true
     }
     buildTypes {
@@ -76,7 +75,9 @@ dependencies {
     compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
     compile 'com.jakewharton:butterknife:8.8.1'
     compile 'com.google.android.gms:play-services-analytics:11.8.0'
-    apt 'com.jakewharton:butterknife-compiler:8.8.1'
+    //compile 'com.google.dagger:dagger:2.0'
+    //annotationProcessor 'com.google.dagger:dagger-compiler:2.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     compile('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') {
         transitive = true;
     }

app/src/arrow/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vsoft.servicenow">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.vsoft.servicenow">
 
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
-    <application>
+    <application
+        tools:replace="android:icon"
+        android:icon="@mipmap/ge_launcher"
+        >
         <activity
             android:name=".chat.ChatActivity"
             android:label="@string/chat_activity_label"

app/src/arrow/java/com/vsoft/servicenow/adapters/HomeScreenAdapter.java

@@ -51,14 +51,14 @@ public class HomeScreenAdapter extends BaseAdapter {
         if (convertView == null) {
             convertView = mInflater.inflate(R.layout.home_screen_adapter, parent, false);
             holder = new ViewHolder();
-            holder.textview = (TextView) convertView.findViewById(R.id.home_screen_adapter_text_view);
+//            holder.textview = (TextView) convertView.findViewById(R.id.home_screen_adapter_text_view);
             holder.imageView = (ImageView) convertView.findViewById(R.id.home_screen_adapter_image_view);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
 
-        holder.textview.setText(mGridValues[position]);
+        //holder.textview.setText(mGridValues[position]);
         holder.imageView.setImageResource(icons.getResourceId(position, -1));
 
         return convertView;

app/src/arrow/res/layout/chat_activity.xml

@@ -61,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/action_send"
-                android:src="@android:drawable/ic_btn_speak_now" />
+                android:src="@drawable/vera_icon" />
 
         </LinearLayout>
 

app/src/arrow/res/layout/splash_screen.xml

@@ -6,9 +6,8 @@
 	android:orientation="vertical">
 
 	<ImageView
-        android:layout_margin="10dp"
-		android:layout_gravity="center"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_width="match_parent"
+		android:scaleType="centerCrop"
+		android:layout_height="match_parent"
  		android:src="@drawable/splash_logo" />
 </FrameLayout>
\ No newline at end of file

app/src/arrow/res/values/arrays.xml

@@ -9,12 +9,12 @@
         <item>Notifications</item>
     </string-array>
     <array name="home_screen_icon_array">
-        <item>@drawable/ic_myincident_icon</item>
-        <item>@drawable/ic_order_service_icon</item>
-        <item>@drawable/ic_my_incidents_icon</item>
-        <item>@drawable/ic_my_requiest_icon</item>
-        <item>@drawable/ic_my_requiest_icon</item>
-        <item>@drawable/ic_my_requiest_icon</item>
+        <item>@drawable/report_incident</item>
+        <item>@drawable/order_serivces</item>
+        <item>@drawable/my_incidents</item>
+        <item>@drawable/my_requests</item>
+        <item>@drawable/chatbot</item>
+        <item>@drawable/my_requests</item>
     </array>
     <string-array name="incident_impact_array">
         <item>-None-</item>

app/src/arrow/res/values/colors.xml

@@ -3,7 +3,7 @@
     <color name="colorPrimary">#00A1DB</color>
     <color name="colorPrimaryDark">#00A1DB</color>
     <color name="colorAccent">#1a4a7d</color>
-
+    <color name="home_screen_bg_color"></color>
     <color name="tool_bar_title_color">@color/colorPrimaryDark</color>
     <color name="view_not_implemented_color">#ff0000</color>
     <color name="submit_button_bg_color">@color/colorPrimaryDark</color>

app/src/arrow/res/values/strings.xml

 <resources>
-	<string name="app_name">Arrow POC</string>
+	<string name="app_name">GE Appliances</string>
 
 	<!--Chat Related String-->
 	<string name="chat_activity_label">Vera</string>

app/src/main/res/layout/home_screen.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+              android:background="@drawable/home_background"
     android:orientation="vertical">
 
     <android.support.v7.widget.Toolbar
@@ -55,7 +56,6 @@
         android:id="@+id/home_screen_grid_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/home_screen_bg_color"
         android:horizontalSpacing="@dimen/large_margin"
         android:numColumns="2"
         android:padding="@dimen/large_margin"

app/src/main/res/layout/home_screen_adapter.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="10dp"
-    card_view:cardBackgroundColor="@color/item_gb_color"
-    card_view:cardCornerRadius="8dp"
-    card_view:cardElevation="10dp"
-    card_view:cardUseCompatPadding="true">
-
-    <RelativeLayout
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/card_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/small_margin"
-        android:background="@color/item_gb_color"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <ImageView
             android:id="@+id/home_screen_adapter_image_view"
-            android:layout_width="@dimen/home_screen_image_height"
-            android:layout_height="@dimen/home_screen_image_height"
+            android:layout_width="150dp"
+            android:layout_height="150dp"
+            android:src="@drawable/chatbot"
+            android:scaleType="centerCrop"
             android:layout_centerHorizontal="true"
-            android:layout_margin="@dimen/home_screen_image_margin" />
+             />
 
-        <TextView
-            android:id="@+id/home_screen_adapter_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/home_screen_adapter_image_view"
-            android:gravity="center"
-            android:textColor="@android:color/white"
-            android:textSize="@dimen/homescreen_text_size" />
+        <!--<TextView-->
+            <!--android:id="@+id/home_screen_adapter_text_view"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:layout_below="@+id/home_screen_adapter_image_view"-->
+            <!--android:gravity="center"-->
+            <!--android:textColor="@android:color/white"-->
+            <!--android:textSize="@dimen/homescreen_text_size" />-->
     </RelativeLayout>
-</android.support.v7.widget.CardView>
+

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.1.0'
 

gradle/wrapper/gradle-wrapper.properties

-#Fri Aug 26 15:36:34 IST 2016
+#Wed Mar 07 21:00:49 IST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+