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

Merge branch 'master' into CategoryDownload

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-05 16:32:07 +05:30
committed by GitHub
parent b6d31c43c0 ad6f57668f
commit 1a1a17e3bf
45 changed files with 5206 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/activity_category_list.xml
+1
View File
@@ -29,6 +29,7 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:backgroundTint="@color/colorPrimary"
android:visibility="gone"
app:srcCompat="@drawable/save_icon" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_geo_tag.xml
+1 -1
View File
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.geotag.GeoTagActivity">
tools:context="cpm.com.gskmtorange.GeoTag.GeoTagActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
GSKMTOrange/src/main/res/layout/activity_storeimage.xml
+28
View File
@@ -0,0 +1,28 @@
<?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="cpm.com.gskmtorange.dailyentry.StoreimageActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
app:popupTheme="@style/AppTheme.NoActionBar.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/contentstoreimage" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/content_geo_tag.xml
+1 -1
View File
@@ -11,7 +11,7 @@
android:paddingRight="@dimen/custom_margin"
android:paddingTop="@dimen/custom_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.geotag.GeoTagActivity"
tools:context="cpm.com.gskmtorange.GeoTag.GeoTagActivity"
tools:showIn="@layout/activity_geo_tag">
</fragment>
GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+4 -5
View File
@@ -5,8 +5,7 @@
android:id="@+id/content_msl__availability"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_msl__availability">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"
@@ -46,7 +45,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="SKU"
android:text="@string/stock_facing_sku_name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
@@ -63,7 +62,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="Stock"
android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
@@ -80,7 +79,7 @@
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="Faceup"
android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/contentstoreimage.xml
+107
View File
@@ -0,0 +1,107 @@
<?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"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.dailyentry.StoreimageActivity"
tools:showIn="@layout/activity_storeimage"
android:weightSum="10"
android:orientation="vertical"
android:background="@color/grey_background">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/colorPrimary">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Click Store Front Image"
android:textSize="@dimen/store_entry_text_size"
android:layout_centerInParent="true"
android:textColor="@color/white"
android:textStyle="bold"/>
</RelativeLayout>
<!-- <RelativeLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_marginTop="10dp"
>
<ImageView
android:id="@+id/imgloreal"
android:layout_width="200dp"
android:layout_height="100dp"
android:src="@drawable/loreal"
android:layout_centerInParent="true"
/>
</RelativeLayout>-->
<android.support.v7.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8"
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/rel_selfie"
>
<ImageView
android:id="@+id/img_selfie"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
/>
<ImageView
android:id="@+id/img_cam_selfie"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/camera_icon_done"
android:layout_centerInParent="true"
/>
</RelativeLayout>
</android.support.v7.widget.CardView>
<Button
android:id="@+id/btn_save_selfie"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:text="@string/save"
android:textSize="@dimen/store_entry_text_size"
android:layout_centerInParent="true"
android:textColor="@color/white"
android:textStyle="bold"
android:layout_marginTop="20dp"/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/custom.xml
+30
View File
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<ProgressBar
android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" />
<TextView
android:id="@+id/percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/progressBar1"
android:layout_marginTop="10dp"/>
<TextView
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/progressBar1"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true" />
</RelativeLayout>
GSKMTOrange/src/main/res/layout/dialogbox.xml
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/white"
android:orientation="vertical"
android:padding="10sp" >
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Store Visited"
android:textColor="@color/black"
android:textSize="25sp" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/white" />
<RadioGroup
android:id="@+id/radiogrpvisit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<RadioButton
android:id="@+id/yes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Yes"
android:textColor="#000000"
android:background="@color/colorPrimary"/>
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@color/white" />
<RadioButton
android:id="@+id/no"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="No"
android:textColor="#000000"
android:background="@color/colorPrimary"/>
</RadioGroup>
</LinearLayout>
GSKMTOrange/src/main/res/layout/geotagstorelist.xml
+4 -2
View File
@@ -4,7 +4,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -25,6 +25,7 @@
<RelativeLayout
android:id="@+id/relativelayout"
android:layout_width="fill_parent"
android:layout_height="55dp"
android:layout_marginBottom="1sp"
@@ -58,7 +59,8 @@
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/geolistviewxml_storeico"
android:layout_alignParentRight="true"
android:background="@mipmap/geopin" />
android:background="@mipmap/geopin"
android:visibility="gone"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
GSKMTOrange/src/main/res/layout/storelist.xml
+39 -2
View File
@@ -62,7 +62,7 @@
>
<ListView
<!-- <ListView
android:id="@+id/list_id"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -72,7 +72,44 @@
android:dividerHeight="2dp"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true"
android:smoothScrollbar="true" />
android:smoothScrollbar="true" />-->
<android.support.v7.widget.RecyclerView
android:id="@+id/drawer_layout_recycle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp"
>
</android.support.v7.widget.RecyclerView>
</LinearLayout>
<LinearLayout
android:id="@+id/linearlayout"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:layout_weight="100"
android:visibility="gone"
>
<View
android:id="@+id/viewid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/sad_cloud"
>
</View>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storelistlayout.xml
+20 -2
View File
@@ -7,6 +7,10 @@
android:orientation="vertical"
android:weightSum="100">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -60,7 +64,7 @@
>
<ListView
<!-- <ListView
android:id="@+id/list_id"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -70,7 +74,21 @@
android:dividerHeight="2dp"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true"
android:smoothScrollbar="true" />
android:smoothScrollbar="true" />-->
<android.support.v7.widget.RecyclerView
android:id="@+id/drawer_layout_recycle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dp"
>
</android.support.v7.widget.RecyclerView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/storeviewlist.xml
+59 -46
View File
@@ -2,71 +2,84 @@
<RelativeLayout 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="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<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"
android:layout_marginBottom="2dp"
android:layout_weight="35"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="15dp">
<RelativeLayout
android:id="@+id/storenamelistview_layout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:padding="10sp">
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/storenamelistview_layout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="6sp"
android:background="@mipmap/store"
android:paddingTop="5sp" />
<TextView
android:id="@+id/storelistviewxml_storename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/storelistviewxml_storeico"
android:layout_toRightOf="@+id/storelistviewxml_storeico"
android:text="GSK MT ORANGE STORE"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
android:padding="10sp">
<TextView
android:id="@+id/storelistviewxml_storeaddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="C 126, Okhla II, "
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
<ImageView
android:id="@+id/storelistviewxml_storeico"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginRight="6sp"
android:background="@mipmap/store"
android:layout_marginTop="10dp"
android:paddingTop="25sp" />
<Button
android:id="@+id/chkout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:focusable="false"
android:visibility="invisible" />
</RelativeLayout>
<TextView
android:id="@+id/storelistviewxml_storename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/storelistviewxml_storeico"
android:layout_toRightOf="@+id/storelistviewxml_storeico"
android:text="GSK MT ORANGE STORE"
android:textColor="#1F3A6C"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/storelistviewxml_storeaddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/storelistviewxml_storename"
android:layout_below="@+id/storelistviewxml_storename"
android:text="C 126, Okhla II, "
android:textColor="#666666"
android:textSize="10sp"
android:textStyle="normal" />
<Button
android:id="@+id/chkout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:focusable="false"
android:visibility="invisible" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_alignBottom="@+id/storelistviewxml_storeico"
android:layout_alignParentRight="true"
android:background="@mipmap/tick_c"
android:visibility="gone"
/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
GSKMTOrange/src/main/res/mipmap-hdpi/geopin.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

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

After

Width:  |  Height:  |  Size: 2.4 KiB

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

After

Width:  |  Height:  |  Size: 1.2 KiB

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

After

Width:  |  Height:  |  Size: 4.9 KiB

GSKMTOrange/src/main/res/mipmap-xhdpi/sad_cloud.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

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

After

Width:  |  Height:  |  Size: 2.7 KiB

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

After

Width:  |  Height:  |  Size: 2.6 KiB

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

After

Width:  |  Height:  |  Size: 2.5 KiB

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

After

Width:  |  Height:  |  Size: 2.6 KiB

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

After

Width:  |  Height:  |  Size: 14 KiB

GSKMTOrange/src/main/res/values-ar/string.xml
+4
View File
@@ -21,4 +21,8 @@
<string name="menu_setting">ضبط</string>
<string name="menu_services">خدمات</string>
</resources>
GSKMTOrange/src/main/res/values-as/string.xml
+2
View File
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+6
View File
@@ -20,6 +20,12 @@
<string name="menu_setting">Ayarlar</string>
<string name="menu_services">Hizmetler</string>
//changes after
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
<string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
<string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
<string name="save">Sakla</string>
<string name="brand">Marka</string>
GSKMTOrange/src/main/res/values/dimens.xml
+3
View File
@@ -11,6 +11,9 @@
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
<dimen name="store_entry_text_size">20sp</dimen>
<dimen name="text_size_xsmall">12sp</dimen>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+24 -1
View File
@@ -39,6 +39,8 @@
<string name="title_activity_store_list_geotag">Store List</string>
<string name="title_activity_store_geotag">Geo Tag</string>
<string name="menu_daily_route_plan">Daily Route Plan</string>
<string name="menu_daily_download">Daily Data Download</string>
@@ -71,9 +73,30 @@
<string name="msl_availability_availability">Availability</string>
<string name="stock_facing_reference_image">Reference Image</string>
<string name="stock_facing_sku_name">SKU Name</string>
<string name="stock_facing_stock">Stock</string>
<string name="stock_facing_facing">Facing</string>
<string name="stock_facing_faceup">Facing</string>
<string name="stock_facing_sos_target">SOS Target</string>
<string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
<string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
<string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
<string name="title_store_list_activity_store_already_done">Store Already Uploaded</string>
<string name="title_store_list_activity_store_data_uploaded">Store Data Uploaded</string>
<string name="title_store_list_activity_store_already_checkout">Store Already Checkout</string>
<string name="title_store_list_activity_store_again_uploaded">Please Store data again Uploaded</string>
<string name="title_store_list_activity_store_closed">Store Closed</string>
<string name="save">SAVE</string>
<string name="title_store_list_checkout_current">Please checkout from current store</string>
<string name="title_store_list_checkout_Already_filled">Data already filled</string>
</resources>
GSKMTOrange/src/main/res/values/styles.xml
+3
View File
@@ -17,4 +17,7 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.NoActionBar.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources>