Commit 0c2c057e by Kunj Gupta

Made some changes in GE flavor.

parent ab25300b
......@@ -46,6 +46,7 @@ android {
debug {
applicationIdSuffix ".debug"
buildConfigField "int", "BUILD_TYPE_INT", "1"
debuggable true
}
release {
minifyEnabled false
......@@ -55,6 +56,7 @@ android {
}
staging { //staging is the UAT environment
applicationIdSuffix ".staging"
debuggable true
buildConfigField "int", "BUILD_TYPE_INT", "3"
signingConfig signingConfigs.debug
}
......
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.vsoft.servicenow">
<application
android:icon="@mipmap/ic_launcher"
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>
<activity
android:name="com.vsoft.servicenow.ui.NotificationScreen"
android:screenOrientation="portrait"/>
<service android:name=".service.NotificationInstanceIdService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
<service
android:name=".service.NotificationMessagingService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/notification_icon"/>
</application>
</manifest>
......@@ -49,6 +49,50 @@
"status": 2
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:957773681882:android:90c2e6c83d0908f5",
"android_client_info": {
"package_name": "com.vsoft.servicenow.ge.staging"
}
},
"oauth_client": [
{
"client_id": "957773681882-go7d0rln03htjche50s07m9r73mqgiu0.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.vsoft.servicenow.ge.debug",
"certificate_hash": "5369fc4c8024379da200c54f6f889559c45b60d2"
}
},
{
"client_id": "957773681882-rl34anslfron5f8epo6d0u0uten6bh4p.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyBN1ZaTBm2S2hBWfajKGq60FtaZzo0ESAs"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "957773681882-rl34anslfron5f8epo6d0u0uten6bh4p.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
......
......@@ -9,15 +9,22 @@ public class AppConfig {
public static final String CHAT_SERVER_URL = "http://111.93.6.218:12910/";
public static final String DOMAIN_RELEASE = "https://ven01199.service-now.com/";
public static final String DOMAIN_DEBUG = "https://geapplightrnd.service-now.com/";
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 = "d958eb06b0f3830093781f441d59febc";
public static final String LOGIN_CLIENT_SECRET_DEBUG = "krD*!O}1.8";
public static final String LOGIN_CLIENT_ID_STAGING = "d958eb06b0f3830093781f441d59febc";
public static final String LOGIN_CLIENT_SECRET_STAGING = "krD*!O}1.8";
/**
* API Base URL
* */
public static final String DOMAIN_RELEASE = "https://geapplightrnd.service-now.com/";
public static final String DOMAIN_DEBUG = "https://geapplightrnd.service-now.com/";
public static final String DOMAIN_STAGING = "https://geapplightrnd.service-now.com/";
/**
* Web services urls
*/
......
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.NotificationMenuItemData;
import com.vsoft.servicenow.menu.OrderServicesMenuItemData;
import com.vsoft.servicenow.menu.ReportIncidentMenuItemData;
......@@ -30,6 +32,14 @@ public class MenuProvider {
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(),
new NotificationMenuItemData.Builder()
.setTitle(R.string.home_screen_notification_title)
.setMenuIconResId(R.string.home_screen_notification_icon)
.build()
);
}

23.6 KB | W: | H:

22.7 KB | W: | H:

app/src/ge/res/drawable/ic_login_banner.png
app/src/ge/res/drawable/ic_login_banner.png
app/src/ge/res/drawable/ic_login_banner.png
app/src/ge/res/drawable/ic_login_banner.png
  • 2-up
  • Swipe
  • Onion skin

23.6 KB | W: | H:

56 KB | W: | H:

app/src/ge/res/drawable/splash_logo.png
app/src/ge/res/drawable/splash_logo.png
app/src/ge/res/drawable/splash_logo.png
app/src/ge/res/drawable/splash_logo.png
  • 2-up
  • Swipe
  • Onion skin
<?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"
<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_marginBottom="10dp"
card_view:cardBackgroundColor="@color/item_gb_color"
card_view:cardCornerRadius="8dp"
card_view:cardElevation="10dp"
card_view:cardUseCompatPadding="true">
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
<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:layout_margin="@dimen/small_margin"
android:background="@color/item_gb_color">
<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:layout_margin="@dimen/home_screen_image_margin" />
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>
<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>
\ No newline at end of file
......@@ -3,12 +3,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:background="@drawable/home_background">
<ImageView
android:layout_margin="10dp"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/splash_screen_logo_margin"
android:layout_marginRight="@dimen/splash_screen_logo_margin"
android:src="@drawable/splash_logo" />
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#1a4a7d</color>
<color name="colorPrimaryDark">#1a4a7d</color>
<color name="colorPrimary">#05183d</color>
<color name="colorPrimaryDark">#05183d</color>
<color name="colorAccent">#1a4a7d</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>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--Home Screen-->
<dimen name="home_screen_image_height">150dp</dimen>
<dimen name="splash_screen_logo_margin">20dp</dimen>
</resources>
\ No newline at end of file
......@@ -4,15 +4,21 @@
<!--Home Screen Option-->
<!--Start-->
<string name="home_screen_report_incident_title">Report Incident</string>
<string name="home_screen_report_incident_icon">ic_my_incident_icon</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">ic_order_service_icon</string>
<string name="home_screen_order_services_icon">order_services</string>
<string name="home_screen_my_incidents_title">My Incidents</string>
<string name="home_screen_my_incidents_icon">ic_my_incidents_icon</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">ic_my_request_icon</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>
<item name="android:background">@drawable/home_background</item>
</style>
</resources>
......@@ -88,9 +88,6 @@
<activity
android:name="com.vsoft.servicenow.ui.MyIncidentScreen"
android:screenOrientation="portrait"/>
<activity
android:name="com.vsoft.servicenow.ui.NotificationScreen"
android:screenOrientation="portrait"/>
<service android:name=".service.SyncService" />
......@@ -103,25 +100,6 @@
</intent-filter>
</receiver>
<service android:name=".service.NotificationInstanceIdService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
<service
android:name=".service.NotificationMessagingService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/notification_icon"/>
<meta-data
android:name="io.fabric.ApiKey"
android:value="2b0a6e9db28d607fbcf71b8b25f1a0795e3f5b22" />
......
......@@ -54,7 +54,7 @@
"client_info": {
"mobilesdk_app_id": "1:957773681882:android:7cdac4a20e2cb330",
"android_client_info": {
"package_name": "com.vsoft.uoflservicenow.debug"
"package_name": "com.vsoft.servicenow.uofl.staging"
}
},
"oauth_client": [
......@@ -62,7 +62,7 @@
"client_id": "957773681882-5vohjmciupgpv35utrukqv7kijek2lm4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.vsoft.uoflservicenow.debug",
"package_name": "com.vsoft.servicenow.uofl.staging",
"certificate_hash": "5369fc4c8024379da200c54f6f889559c45b60d2"
}
},
......
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