AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deepak_commit_31_05_2018

Browse Source
This commit is contained in:
yadavendras
2018-06-22 18:32:06 +05:30
parent 8a58f5fa64
commit 17212dee28
47 changed files with 2798 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/drawable/cancel.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

GSKMTOrange/src/main/res/drawable/chat_background.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

GSKMTOrange/src/main/res/drawable/chat_wallpaper.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 221 KiB

GSKMTOrange/src/main/res/drawable/ic_send_white_24dp.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 728 B

GSKMTOrange/src/main/res/layout/activity_conversation.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".dailyentry.ConversationActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_conversation" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginRight="10dp"
android:layout_marginBottom="5dp"
app:srcCompat="@drawable/ic_send_white_24dp"
/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_message.xml
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".dailyentry.MessageActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_message" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/right_arrow" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/add_facing_custom_dialog.xml
+1
View File
@@ -59,6 +59,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/lay_placement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
GSKMTOrange/src/main/res/layout/content_conversation.xml
+67
View File
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.ConversationActivity"
tools:showIn="@layout/activity_conversation"
android:background="@drawable/chat_background"
android:orientation="vertical"
android:weightSum="10">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_conversation"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8.8"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.2"
android:orientation="horizontal"
android:weightSum="10"
android:layout_marginBottom="5dp"
>
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="8"
android:layout_marginBottom="2dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="20dp"
android:elevation="10dp"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<EditText
android:id="@+id/et_reply"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/hint_reply"
android:layout_marginLeft="5dp"
android:textSize="16sp"
/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_message.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".dailyentry.MessageActivity"
tools:showIn="@layout/activity_message"
android:background="@color/grey_background">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/conversation_item.xml
+110
View File
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:id="@+id/parent_item">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp"
android:elevation="10dp"
>
<LinearLayout
android:id="@+id/layout_parent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:padding="10sp"
android:weightSum="10">
<!-- <RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginRight="6sp"
android:layout_weight="1"
android:background="@mipmap/baseline_message_black_48" />
</RelativeLayout>-->
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="Details"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="Details"
android:layout_marginRight="10dp"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
</RelativeLayout>
<TextView
android:id="@+id/tv_msg_topic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_latest_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="Details"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/message_topic_item.xml
+108
View File
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/transparent">
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginTop="2dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp"
android:elevation="10dp"
>
<LinearLayout
android:id="@+id/layout_parent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:padding="10sp"
android:weightSum="10">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginRight="6sp"
android:layout_weight="1"
android:background="@mipmap/baseline_message_black_48" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="9"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_from"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="Details"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="Details"
android:layout_marginRight="10dp"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
</RelativeLayout>
<TextView
android:id="@+id/tv_msg_topic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Title"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_latest_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="Details"
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storelist.xml
-2
View File
@@ -49,8 +49,6 @@
android:orientation="vertical"
android:weightSum="10"
android:visibility="gone"
>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
GSKMTOrange/src/main/res/layout/t2p_item_layout.xml
+34
View File
@@ -118,6 +118,40 @@
</LinearLayout>
<LinearLayout
android:id="@+id/layout_t2p_non_reason"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3"
android:visibility="gone">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="@dimen/custom_margin"
android:text="@string/reason"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
<Spinner
android:id="@+id/spinner_t2p_non_reason"
android:background="@drawable/spinner_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
/>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
GSKMTOrange/src/main/res/menu/activity_main_drawer.xml
+10 -1
View File
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<group android:checkableBehavior="single">
<item
@@ -14,11 +16,18 @@
android:id="@+id/nav_upload"
android:icon="@mipmap/upload_grey"
android:title="@string/menu_upload_data" />
<item
android:id="@+id/nav_geotag"
android:icon="@mipmap/geotag_grey"
android:title="@string/menu_geotag" />
<item
android:id="@+id/nav_deviation"
android:icon="@mipmap/baseline_launch_black_48"
android:title="@string/menu_deviation_data"
android:visible="false"/>
<item
android:id="@+id/nav_future_jcp"
android:icon="@drawable/ic_date_range_black"
GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_launch_black_48.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 807 B

GSKMTOrange/src/main/res/mipmap-xxhdpi/baseline_message_black_48.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 697 B

GSKMTOrange/src/main/res/values/colors.xml
+2 -1
View File
@@ -17,5 +17,6 @@
<color name="colorOrange">#FFE0B2</color>
<color name="red">#ff0000</color>
<color name="transparent">#00FFFFFF</color>
<color name="char_card_bg">#b7ffa1</color>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+11
View File
@@ -355,6 +355,17 @@
<string name="title_activity_store_list_map">Map</string>
<string name="title_activity_store_list_route">Map</string>
<string name="title_activity_store_route">Map</string>
<string name="cannot_add_horizontal_to_filled_row">Cannot add Horizontal Separator to filled row</string>
<string name="cannot_add_to_horizontal_seperatore">Cannot add to row already having Horizontal Separator </string>
<string name="menu_deviation_data">Ad hoc Visits</string>
<string name="title_activity_message">Messages</string>
<string name="error_message_non_t2p_reason">Please select Non T2P reason</string>
<string name="title_activity_conversation">Conversations</string>
<string name="reply_alert">Please enter reply</string>
<string name="adhoc_store_list">Ad hoc - Store List</string>
<string name="jcp">JCP</string>
<string name="adhoc">Ad hoc</string>
<string name="hint_reply">Type response</string>
</resources>