Commit 7cab7b0c by Simhachalam ch

added V-portal flavour and design changes

parent c71e8f4f
Showing with 303 additions and 13 deletions
...@@ -41,13 +41,16 @@ android { ...@@ -41,13 +41,16 @@ android {
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
buildConfigField "int", "BUILD_TYPE_INT", "1" buildConfigField "int", "BUILD_TYPE_INT", "1"
} }
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "int", "BUILD_TYPE_INT", "2" buildConfigField "int", "BUILD_TYPE_INT", "2"
signingConfig signingConfigs.config signingConfig signingConfigs.config
} }
staging {
initWith debug
applicationIdSuffix ".staging"
}
} }
productFlavors { productFlavors {
...@@ -61,9 +64,11 @@ android { ...@@ -61,9 +64,11 @@ android {
applicationId "com.vsoft.servicenow.ge" applicationId "com.vsoft.servicenow.ge"
} }
arrow { arrow {
dimension 'tier'
applicationId "com.vsoft.servicenow.arrow" applicationId "com.vsoft.servicenow.arrow"
} }
vportal {
applicationId "com.vsoft.servicenow.vportal"
}
} }
} }
......
...@@ -7,15 +7,5 @@ ...@@ -7,15 +7,5 @@
<application <application
android:icon="@mipmap/ge_launcher" android:icon="@mipmap/ge_launcher"
tools:replace="android:icon"> tools:replace="android:icon">
<activity
android:name=".chat.ChatActivity"
android:label="@string/chat_activity_label"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application> </application>
</manifest> </manifest>
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<supports-screens <supports-screens
android:anyDensity="true" android:anyDensity="true"
......
...@@ -20,7 +20,6 @@ import com.google.android.gms.analytics.Tracker; ...@@ -20,7 +20,6 @@ import com.google.android.gms.analytics.Tracker;
import com.vsoft.servicenow.db.DBManager; import com.vsoft.servicenow.db.DBManager;
import com.vsoft.servicenow.service.SyncService; import com.vsoft.servicenow.service.SyncService;
import com.vsoft.servicenow.ui.LoginScreen; import com.vsoft.servicenow.ui.LoginScreen;
import com.vsoft.servicenow.utils.CatalogueLog;
import com.vsoft.servicenow.utils.Constants; import com.vsoft.servicenow.utils.Constants;
import com.vsoft.servicenow.utils.PrefManager; import com.vsoft.servicenow.utils.PrefManager;
import com.vsoft.servicenow.utils.Util; import com.vsoft.servicenow.utils.Util;
......
...@@ -583,6 +583,7 @@ public class Util { ...@@ -583,6 +583,7 @@ public class Util {
} }
public static long getDateTimeForMyRequestFromString(String strDate) { public static long getDateTimeForMyRequestFromString(String strDate) {
SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss"); SimpleDateFormat df = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
Date date = null; Date date = null;
try { try {
...@@ -590,8 +591,11 @@ public class Util { ...@@ -590,8 +591,11 @@ public class Util {
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
} }
if(date!=null){
return date.getTime(); return date.getTime();
} }
return 0;
}
public static void createDynamicTableForIncidentFormValues() { public static void createDynamicTableForIncidentFormValues() {
......
<manifest package="com.vsoft.servicenow"
xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name="com.vsoft.servicenow.chat.ChatActivity"
android:screenOrientation="portrait"/>
</application>
</manifest>
{
"project_info": {
"project_number": "222593508124",
"firebase_url": "https://v-soft-poc-apps.firebaseio.com",
"project_id": "v-soft-poc-apps",
"storage_bucket": "v-soft-poc-apps.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:222593508124:android:d77c1b70d2a38b4d",
"android_client_info": {
"package_name": "com.vsoft.servicenow.arrow.debug"
}
},
"oauth_client": [
{
"client_id": "222593508124-1jq94gaia4oahk321cd8ud74jv6tqgr3.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyALtTZoenaAEMfqvBLlHRsAU4P_aoOYBLg"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:222593508124:android:ade631ceed1f3560",
"android_client_info": {
"package_name": "com.vsoft.servicenow.vportal.debug"
}
},
"oauth_client": [
{
"client_id": "222593508124-1jq94gaia4oahk321cd8ud74jv6tqgr3.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyALtTZoenaAEMfqvBLlHRsAU4P_aoOYBLg"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
\ No newline at end of file
package com.vsoft.servicenow;
import android.content.Context;
/**
* @author Kunj on 05/01/17.
*/
public class AppConfig {
public static final String APP_INTERNAL_NAME = "V-Portal";
public static final String CHAT_SERVER_URL = "http://111.93.6.218:12912"; // "http://10.1.8.170:12912/";
public static final String LOGIN_CLIENT_ID_RELEASE = "d958eb06b0f3830093781f441d59febc";
public static final String LOGIN_CLIENT_SECRET_RELEASE = "krD*!O}1.8";
public static final String LOGIN_CLIENT_ID_DEBUG = "091b5d1ea97cd700e4268b90dd5521ca";
public static final String LOGIN_CLIENT_SECRET_DEBUG = "+tPJ@jS<;S";
/**
* Web services urls
*/
/*Catalogue Category API */
public static final String URL_GET_CATALOGUE = "api/vsng2/uofl_mobile/catalogue_screen";
/*Catalogue Category Items API */
public static final String URL_GET_CATALOGUE_ITEM = "api/vsng2/uofl_mobile/catalog_item";
/*Variable form API */
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";
public static final String DOMAIN_RELEASE = "https://vsoftconsultingtest.service-now.com/";
public static final String DOMAIN_DEBUG = "https://vsoftconsultingtest.service-now.com/";
/**
* initializing the environment urls
* @param context
*/
public static void initEnvironmentUrl(Context context){
String packageName = context.getApplicationContext().getPackageName();
if(packageName.contains(".debug")){
//demo1 instance - development & internal testing
// DOMAIN_RELEASE = "https://ven01199.service-now.com/";
// DOMAIN_DEBUG = "https://ven01199.service-now.com/";
}else if(packageName.contains(".staging")){
//test instance - staging for UAT
// DOMAIN_RELEASE = "https://ven01199.service-now.com/";
// DOMAIN_DEBUG = "https://ven01199.service-now.com/";
}else {
//release url - production for play store release
// DOMAIN_RELEASE = "https://ven01199.service-now.com/";
// DOMAIN_DEBUG = "https://ven01199.service-now.com/";
}
}
}
package com.vsoft.servicenow;
import com.vsoft.servicenow.menu.ChatMenuItemData;
import com.vsoft.servicenow.menu.HomeScreenMenuItemData;
import com.vsoft.servicenow.menu.MyIncidentMenuItemData;
import com.vsoft.servicenow.menu.MyRequestMenuItemData;
import com.vsoft.servicenow.menu.OrderServicesMenuItemData;
import com.vsoft.servicenow.menu.ReportIncidentMenuItemData;
import java.util.Arrays;
import java.util.List;
/**
* Created by Kunj on 3/23/18.
*/
public class MenuProvider {
public static final List<HomeScreenMenuItemData> MENU_ITEMS = Arrays.asList(
new ReportIncidentMenuItemData.Builder()
.setTitle(R.string.home_screen_report_incident_title)
.setMenuIconResId(R.string.home_screen_report_incident_icon)
.build(),
new OrderServicesMenuItemData.Builder()
.setTitle(R.string.home_screen_order_services_title)
.setMenuIconResId(R.string.home_screen_order_services_icon)
.build(),
new MyIncidentMenuItemData.Builder()
.setTitle(R.string.home_screen_my_incidents_title)
.setMenuIconResId(R.string.home_screen_my_incidents_icon)
.build(),
new MyRequestMenuItemData.Builder()
.setTitle(R.string.home_screen_report_incident_title)
.setMenuIconResId(R.string.home_screen_my_request_icon)
.build(),
new ChatMenuItemData.Builder()
.setTitle(R.string.home_screen_chat_title)
.setMenuIconResId(R.string.home_screen_chat_icon)
.build()
);
}
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_width="match_parent"
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_centerHorizontal="true"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/home_screen_adapter_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_below="@+id/home_screen_adapter_image_view"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="@dimen/homescreen_text_size" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical">
<ImageView
android:layout_margin="10dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/splash_logo" />
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#6F9A3E</color>
<color name="colorPrimaryDark">#A9A9A9</color>
<color name="colorAccent">#6F9A3E</color>
<color name="item_gb_color">#000000</color>
<color name="error_color">#6F9A3E</color>
<color name="name_null_view_color">#88FFA500</color>
<color name="view_not_implemented_color">#6F9A3E</color>
<color name="home_screen_bg_color">@color/colorPrimary</color>
<color name="screen_bg_color">#c2d1d3</color>
<color name="bg_border_color">#d6d6d6</color>
<color name="back_button_bg_color">#4f0307</color>
<color name="submit_button_bg_color">#6F9A3E</color>
<color name="divider_color">#c9c8cc</color>
<color name="tool_bar_title_color">#6F9A3E</color>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="home_screen_image_height">150dp</dimen>
</resources>
<resources>
<string name="app_name">V-Portal</string>
<!--Home Screen Option-->
<!--Start-->
<string name="home_screen_report_incident_title">Report Incident</string>
<string name="home_screen_report_incident_icon">report_incident</string>
<string name="home_screen_order_services_title">Order Services</string>
<string name="home_screen_order_services_icon">order_serivces</string>
<string name="home_screen_my_incidents_title">My Incidents</string>
<string name="home_screen_my_incidents_icon">my_incidents</string>
<string name="home_screen_my_request_title">My Requests</string>
<string name="home_screen_my_request_icon">my_requests</string>
<string name="home_screen_chat_title">Chatbot</string>
<string name="home_screen_chat_icon">chatbot</string>
<string name="home_screen_notification_title">Notifications</string>
<string name="home_screen_notification_icon">notifications</string>
<!--End-->
</resources>
<resources>
<style name="HomeBackgroundStyle" parent="@style/Theme.AppCompat">
<item name="android:background">@color/home_screen_bg_color</item>
</style>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Replace placeholder ID with your tracking ID -->
<string name="ga_trackingId">UA-83545030-1</string>
<!-- Enable automatic activity tracking -->
<bool name="ga_autoActivityTracking">true</bool>
<!-- Enable automatic exception tracking -->
<bool name="ga_reportUncaughtExceptions">true</bool>
</resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment