Integrated all V-portal related chaanges

app/build.gradle

@@ -19,10 +19,10 @@ apply plugin: 'android-apt'
 android {
 android {
     signingConfigs {
     signingConfigs {
         config {
         config {
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storeFile file('/home/chaukadev/.android/debug.keystore')
-            storePassword 'android'
+            keyAlias 'Uofl'
+            keyPassword 'Vsoft@123'
+            storeFile file('/Users/apple/Desktop/uofl_builds/Uofl_keys')
+            storePassword 'Vsoft@123'
         }
         }
     }
     }
 
 
@@ -62,7 +62,7 @@ android {
 }
 }
 
 
 dependencies {
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:24.1.1'
     compile 'com.android.support:appcompat-v7:24.1.1'
     compile 'com.squareup.retrofit2:retrofit:2.0.1'
     compile 'com.squareup.retrofit2:retrofit:2.0.1'

app/src/main/AndroidManifest.xml

@@ -47,7 +47,7 @@
     <application
     <application
         android:name="com.vsoft.servicenow.CatalogueApplication"
         android:name="com.vsoft.servicenow.CatalogueApplication"
         android:allowBackup="true"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         android:theme="@style/AppTheme">

app/src/main/res/drawable/login_bg.xml

@@ -2,12 +2,12 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
     android:shape="rectangle" >
 
 
-    <solid android:color="#e51b23" />
+    <solid android:color="#6F9A3E" />
 
 
     <corners android:radius="10dip" />
     <corners android:radius="10dip" />
 
 
     <stroke
     <stroke
         android:width="1dp"
         android:width="1dp"
-        android:color="#e51b23" />
+        android:color="#6F9A3E" />
 
 
 </shape>
 </shape>
\ No newline at end of file

app/src/main/res/drawable/username_under_bg_box.xml

@@ -7,7 +7,7 @@
         android:bottom="1dp"
         android:bottom="1dp"
         >
         >
         <shape android:shape="rectangle">
         <shape android:shape="rectangle">
-            <stroke android:width="1dp" android:color="#e51b23"/>
+            <stroke android:width="1dp" android:color="#6F9A3E"/>
             <solid android:color="@android:color/transparent"/>
             <solid android:color="@android:color/transparent"/>
         </shape>
         </shape>
     </item>
     </item>

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

@@ -19,7 +19,7 @@
         <LinearLayout
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/ic_login_layout_bg"
+            android:background="#fff"
             android:orientation="vertical">
             android:orientation="vertical">
 
 
             <EditText
             <EditText
@@ -56,7 +56,7 @@
                 android:layout_marginBottom="@dimen/normal_margin"
                 android:layout_marginBottom="@dimen/normal_margin"
                 android:layout_marginLeft="@dimen/extra_large_margin"
                 android:layout_marginLeft="@dimen/extra_large_margin"
                 android:layout_marginRight="@dimen/extra_large_margin"
                 android:layout_marginRight="@dimen/extra_large_margin"
-                android:layout_marginTop="@dimen/normal_margin"
+                android:layout_marginTop="30dp"
                 android:background="@drawable/login_bg"
                 android:background="@drawable/login_bg"
                 android:gravity="center"
                 android:gravity="center"
                 android:paddingBottom="@dimen/normal_margin"
                 android:paddingBottom="@dimen/normal_margin"

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

@@ -42,10 +42,11 @@
 
 
             <ImageView
             <ImageView
                 android:id="@+id/home_screen_logout_image_view"
                 android:id="@+id/home_screen_logout_image_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:layout_centerVertical="true"
+                android:layout_margin="3dp"
                 android:src="@drawable/logout_icon" />
                 android:src="@drawable/logout_icon" />
 
 
         </RelativeLayout>
         </RelativeLayout>

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

@@ -8,6 +8,7 @@
     android:layout_margin="0dp"
     android:layout_margin="0dp"
     android:minHeight="?attr/actionBarSize"
     android:minHeight="?attr/actionBarSize"
     android:padding="0dp"
     android:padding="0dp"
+    app:titleTextColor="@color/tool_bar_title_color"
     app:contentInsetEnd="0dp"
     app:contentInsetEnd="0dp"
     app:contentInsetLeft="0dp"
     app:contentInsetLeft="0dp"
     app:contentInsetRight="0dp"
     app:contentInsetRight="0dp"

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

@@ -22,6 +22,7 @@
             android:id="@+id/toolbar_refresh_icon"
             android:id="@+id/toolbar_refresh_icon"
             android:layout_width="@dimen/uofl_tool_bar_refresh_button_width"
             android:layout_width="@dimen/uofl_tool_bar_refresh_button_width"
             android:layout_height="@dimen/uofl_tool_bar_refresh_button_height"
             android:layout_height="@dimen/uofl_tool_bar_refresh_button_height"
+            android:layout_margin="3dp"
             android:src="@drawable/refresh_icon" />
             android:src="@drawable/refresh_icon" />
 
 
         <ProgressBar
         <ProgressBar

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

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <resources>
-    <color name="colorPrimary">#F44336</color>
-    <color name="colorPrimaryDark">#D32F2F</color>
-    <color name="colorAccent">#FF5252</color>
+    <color name="colorPrimary">#6F9A3E</color>
+    <color name="colorPrimaryDark">#6F9A3E</color>
+    <color name="colorAccent">#6F9A3E</color>
     <color name="item_gb_color">#000000</color>
     <color name="item_gb_color">#000000</color>
-    <color name="error_color">#FF0000</color>
+    <color name="error_color">#6F9A3E</color>
 
 
     <color name="name_null_view_color">#88FFA500</color>
     <color name="name_null_view_color">#88FFA500</color>
-    <color name="view_not_implemented_color">#88ff0000</color>
+    <color name="view_not_implemented_color">#6F9A3E</color>
 
 
     <color name="home_screen_bg_color">@color/colorPrimary</color>
     <color name="home_screen_bg_color">@color/colorPrimary</color>
 
 
@@ -15,7 +15,7 @@
     <color name="bg_border_color">#d6d6d6</color>
     <color name="bg_border_color">#d6d6d6</color>
 
 
     <color name="back_button_bg_color">#4f0307</color>
     <color name="back_button_bg_color">#4f0307</color>
-    <color name="submit_button_bg_color">#e31b22</color>
+    <color name="submit_button_bg_color">#6F9A3E</color>
     <color name="divider_color">#c9c8cc</color>
     <color name="divider_color">#c9c8cc</color>
-    <color name="tool_bar_title_color">#E41B23</color>
+    <color name="tool_bar_title_color">#6F9A3E</color>
 </resources>
 </resources>

app/src/main/res/values/dimen.xml

@@ -41,6 +41,6 @@
 
 
     <!--Action bar refresh icon size-->
     <!--Action bar refresh icon size-->
     <dimen name="progress_bar_padding_size">13dp</dimen>
     <dimen name="progress_bar_padding_size">13dp</dimen>
-    <dimen name="uofl_tool_bar_refresh_button_width">40dp</dimen>
-    <dimen name="uofl_tool_bar_refresh_button_height">40dp</dimen>
+    <dimen name="uofl_tool_bar_refresh_button_width">35dp</dimen>
+    <dimen name="uofl_tool_bar_refresh_button_height">35dp</dimen>
 </resources>
 </resources>
\ No newline at end of file

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

 <resources>
 <resources>
-	<string name="app_name">UofL ServiceNow</string>
+	<string name="app_name">V-Portal</string>
 
 
 	<string name="set_string">Set</string>
 	<string name="set_string">Set</string>
 	<string name="submit_string">Submit</string>
 	<string name="submit_string">Submit</string>

app/src/uofl/java/com/vsoft/servicenow/AppConfig.java

@@ -5,29 +5,29 @@ package com.vsoft.servicenow;
  */
  */
 public class AppConfig {
 public class AppConfig {
 
 
-    public static final String APP_INTERNAL_NAME = "UofL ServiceNow";
+    public static final String APP_INTERNAL_NAME = "V-Portal";
 
 
     public static final String DOMAIN_PRODUCTION = "https://ven01199.service-now.com/";
     public static final String DOMAIN_PRODUCTION = "https://ven01199.service-now.com/";
-    public static final String DOMAIN_TEST = "https://uofltest.service-now.com/";
+    public static final String DOMAIN_TEST = "https://ven01199.service-now.com/";//"https://uofltest.service-now.com/";
 
 
-    public static final String LOGIN_CLIENT_ID_PRODUCTION = "ac0dd3408c1031006907010c2cc6ef6d";
-    public static final String LOGIN_CLIENT_SECRET_PRODUCTION = "oklj6znxv3o9jmyn2mlp";
+    public static final String LOGIN_CLIENT_ID_PRODUCTION = "d958eb06b0f3830093781f441d59febc";
+    public static final String LOGIN_CLIENT_SECRET_PRODUCTION = "krD*!O}1.8";
 
 
-    public static final String LOGIN_CLIENT_ID_TEST = "ac0dd3408c1031006907010c2cc6ef6d";
-    public static final String LOGIN_CLIENT_SECRET_TEST = "oklj6znxv3o9jmyn2mlp";
+    public static final String LOGIN_CLIENT_ID_TEST = "d958eb06b0f3830093781f441d59febc";
+    public static final String LOGIN_CLIENT_SECRET_TEST = "krD*!O}1.8";
 
 
     /**
     /**
      * Web services urls
      * Web services urls
      */
      */
     /*Catalogue Category API */
     /*Catalogue Category API */
-    public static final String URL_GET_CATALOGUE = "api/uno33/uofl_mobile/catalogue_screen";
+    public static final String URL_GET_CATALOGUE = "api/vsng2/uofl_mobile/catalogue_screen";
 
 
     /*Catalogue Category Items API */
     /*Catalogue Category Items API */
-    public static final String URL_GET_CATALOGUE_ITEM = "api/uno33/uofl_mobile/catalog_item";
+    public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/uofl_mobile/catalog_item";
 
 
     /*Variable form API */
     /*Variable form API */
-    public static final String URL_GET_VARIABLE = "api/uno33/uofl_mobile/catalogue_variable_screen";
-    public static final String URL_GET_UI_POLICY = "/api/uno33/uofl_mobile/uipolicy";
-    public static final String URL_GET_VARIABLE_CHOICE = "/api/uno33/uofl_mobile/question_choice";
-    public static final String URL_POST_CATALOGUE_ITEM = "api/uno33/uofl_mobile";
+    public static final String URL_GET_VARIABLE = "api/vsng2/uofl_mobile/catalogue_variable_screen";
+    public static final String URL_GET_UI_POLICY = "/api/vsng2/uofl_mobile/uipolicy";
+    public static final String URL_GET_VARIABLE_CHOICE = "/api/vsng2/uofl_mobile/question_choice";
+    public static final String URL_POST_CATALOGUE_ITEM = "api/vsng2/uofl_mobile";
 }
 }

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

@@ -2,11 +2,13 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:layout_height="match_parent"
+	android:layout_gravity="center"
 	android:orientation="vertical">
 	android:orientation="vertical">
 
 
 	<ImageView
 	<ImageView
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:scaleType="fitXY"
-		android:src="@drawable/splash_screen_background" />
+        android:layout_margin="10dp"
+		android:layout_gravity="center"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+ 		android:src="@drawable/splash_logo" />
 </FrameLayout>
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <resources>
-    <color name="colorPrimary">#F44336</color>
-    <color name="colorPrimaryDark">#D32F2F</color>
-    <color name="colorAccent">#FF5252</color>
+    <color name="colorPrimary">#6F9A3E</color>
+    <color name="colorPrimaryDark">#A9A9A9</color>
+    <color name="colorAccent">#6F9A3E</color>
     <color name="item_gb_color">#000000</color>
     <color name="item_gb_color">#000000</color>
-    <color name="error_color">#FF0000</color>
+    <color name="error_color">#6F9A3E</color>
 
 
     <color name="name_null_view_color">#88FFA500</color>
     <color name="name_null_view_color">#88FFA500</color>
-    <color name="view_not_implemented_color">#88ff0000</color>
+    <color name="view_not_implemented_color">#6F9A3E</color>
 
 
     <color name="home_screen_bg_color">@color/colorPrimary</color>
     <color name="home_screen_bg_color">@color/colorPrimary</color>
 
 
@@ -15,7 +15,7 @@
     <color name="bg_border_color">#d6d6d6</color>
     <color name="bg_border_color">#d6d6d6</color>
 
 
     <color name="back_button_bg_color">#4f0307</color>
     <color name="back_button_bg_color">#4f0307</color>
-    <color name="submit_button_bg_color">#e31b22</color>
+    <color name="submit_button_bg_color">#6F9A3E</color>
     <color name="divider_color">#c9c8cc</color>
     <color name="divider_color">#c9c8cc</color>
-    <color name="tool_bar_title_color">#E41B23</color>
+    <color name="tool_bar_title_color">#6F9A3E</color>
 </resources>
 </resources>

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

 <resources>
 <resources>
-	<string name="app_name">UofL ServiceNow</string>
+	<string name="app_name">V-Portal</string>
 
 
 	<string name="set_string">Set</string>
 	<string name="set_string">Set</string>
 	<string name="submit_string">Submit</string>
 	<string name="submit_string">Submit</string>