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

Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-09 18:13:27 +05:30
parent 83e6be733b
commit a95bf5cddd
19 changed files with 2195 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionaldialoglayout.xml
+129
View File
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="100">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="184dp"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:weightSum="100">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:weightSum="25">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Brand Name"
android:textStyle="bold" />
<TextView
android:id="@+id/brand_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15"
android:inputType="text">
</TextView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:weightSum="25">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="SKU Name"
android:textStyle="bold" />
<TextView
android:id="@+id/display_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15">
</TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/third"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:weightSum="25">
<TextView
android:id="@+id/facing"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Quantity"
android:textStyle="bold" />
<TextView
android:id="@+id/qty_bought"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15"
android:inputType="number">
</TextView>
</LinearLayout>
<!-- </LinearLayout> -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:weightSum="25">
<Button
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@color/grey_background"
android:layout_marginLeft="30dp"
android:text="Delete" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+129
View File
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="100">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="184dp"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:weightSum="100">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:weightSum="25">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Brand Name"
android:textStyle="bold" />
<TextView
android:id="@+id/brand_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15"
android:inputType="text">
</TextView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:weightSum="25">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="SKU Name"
android:textStyle="bold" />
<TextView
android:id="@+id/display_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15">
</TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/third"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="25">
<TextView
android:id="@+id/facing"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Quantity"
android:textStyle="bold" />
<TextView
android:id="@+id/qty_bought"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="15"
android:inputType="number">
</TextView>
</LinearLayout>
<!-- </LinearLayout> -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:weightSum="25">
<Button
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:background="@color/grey_background"
android:layout_marginLeft="30dp"
android:text="Delete" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml
+2 -15
View File
@@ -7,22 +7,9 @@
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.dailyentry.AdditionalVisibility">
<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/contentadditionalvisibility" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
@@ -31,8 +18,8 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_save"
app:backgroundTint="@color/colorPrimary"
android:visibility="gone"
/>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+219 -70
View File
@@ -1,92 +1,241 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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"
android:background="@color/grey_background"
android:paddingBottom="@dimen/custom_margin"
android:paddingLeft="@dimen/custom_margin"
android:paddingRight="@dimen/custom_margin"
android:paddingTop="@dimen/custom_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
>
android:orientation="vertical"
android:weightSum="100">
<android.support.v7.widget.RecyclerView
android:id="@+id/rec_store_data"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
android:theme="@style/AppTheme.AppBarOverlay">
<LinearLayout
android:id="@+id/no_data_lay"
<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>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="60"
android:background="@color/grey_background"
android:orientation="vertical"
android:weightSum="8">
card_view:cardCornerRadius="20dp"
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp">
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/grey_background"
android:weightSum="100">
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="No data available"
android:textSize="25sp"
android:textStyle="bold" />
</android.support.v7.widget.CardView>
android:layout_height="0dp"
android:layout_weight="8"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="2">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/tv_"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:text="@string/AdditionalDisplay" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_centerInParent="true"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight="4"
android:background="@drawable/sad_cloud"
android:id="@+id/imageView3" />
<ToggleButton
android:id="@+id/btntoggle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5" />
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<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_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="5dp">
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="Please download data"
android:textSize="25sp"
android:textStyle="bold" />
</android.support.v7.widget.CardView>
android:layout_height="0dp"
android:layout_weight="30"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
</LinearLayout>
<TextView
android:id="@+id/tv_brand"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:text="@string/brand"
android:textStyle="bold" />
</RelativeLayout>
<Spinner
android:id="@+id/spinner_Brand1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="30"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:text="@string/Display"
android:textStyle="bold" />
<Spinner
android:id="@+id/spinner_SkuMaster"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="15"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingLeft="5dp"
android:text="@string/Photo"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<ImageView
android:id="@+id/btn_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/new_camera" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<ImageView
android:id="@+id/btn_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@mipmap/new_no_camera"
android:inputType="number" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8"
android:background="@color/grey_background"
android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="9"
android:background="@color/grey_background"
android:padding="5dp">
<Button
android:id="@+id/btadd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@color/colorPrimary"
android:text="@string/add" />
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:layout_weight="40"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
>
<ListView
android:id="@+id/listviewlv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/custom_spinner_item.xml
+43
View File
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardBackgroundColor="@color/white"
card_view:cardCornerRadius="10dp"
>
<LinearLayout
android:id="@+id/parent_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
<TextView
android:id="@+id/tv_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Checklist"
android:textColor="@color/black"
android:textStyle="bold"
android:gravity="center_vertical"
android:paddingTop="2dp"
android:paddingBottom="@dimen/custom_margin"
android:textSize="@dimen/text_size_xsmall"
android:paddingLeft="@dimen/custom_margin"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/layout/t2p_sku_dialog_layout.xml
+57 -30
View File
@@ -1,10 +1,9 @@
<?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:orientation="vertical"
android:layout_width="300dp"
android:layout_height="match_parent"
>
android:orientation="vertical">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
@@ -27,20 +26,19 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginTop="15dp"
android:paddingBottom="20dp"
android:paddingLeft="5dp"
android:text="@string/sku"
android:textSize="@dimen/text_size_normal"
android:paddingBottom="20dp"
android:textColor="@color/white"
/>
android:textSize="@dimen/text_size_normal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2"
android:background="@color/grey_background"
android:padding="5dp">
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<TextView
android:id="@+id/tv_brand"
@@ -48,15 +46,14 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/brand"
android:paddingLeft="5dp"/>
android:paddingLeft="5dp"
android:text="@string/brand" />
<Spinner
android:id="@+id/spinner_brand"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="2" />
</LinearLayout>
@@ -64,25 +61,24 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2"
android:background="@color/grey_background"
android:padding="5dp">
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/sku"
android:paddingLeft="5dp"/>
android:paddingLeft="5dp"
android:text="@string/sku" />
<Spinner
android:id="@+id/spinner_sku"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="2" />
</LinearLayout>
@@ -90,25 +86,25 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="2"
android:background="@color/grey_background"
android:padding="5dp">
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/stock"
android:paddingLeft="5dp"/>
android:paddingLeft="5dp"
android:text="@string/stock" />
<EditText
android:id="@+id/et_stock"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="2"
android:inputType="number" />
</LinearLayout>
@@ -116,14 +112,15 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:background="@color/grey_background">
android:background="@color/grey_background"
android:padding="10dp">
<Button
android:id="@+id/btn_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/add"/>
android:text="@string/add" />
</RelativeLayout>
@@ -131,4 +128,34 @@
</android.support.v7.widget.CardView>
</LinearLayout>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
>
<LinearLayout
android:id="@+id/list_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="95"
android:visibility="gone"
>
<ListView
android:id="@+id/lv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
GSKMTOrange/src/main/res/mipmap-mdpi/new_camera.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

After

Width:  |  Height:  |  Size: 1.1 KiB

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

After

Width:  |  Height:  |  Size: 4.9 KiB

GSKMTOrange/src/main/res/values/dimens.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="custom_margin">5dp</dimen>
<dimen name="custom_margin">10dp</dimen>
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
GSKMTOrange/src/main/res/values/strings.xml
+7
View File
@@ -34,6 +34,7 @@
<string name="select">Select</string>
<string name="add">Add</string>
<string name="select_language">Please select language</string>
<string name="title_activity_select_language">SelectLanguageActivity</string>
@@ -100,4 +101,10 @@
<string name="title_store_list_download_data">Please Download Data First</string>
<string name="AdditionalDisplay">Is there any Additional Display</string>
<string name="Display">Display</string>
<string name="Photo">Photo</string>
<string name="title_activity_Additional_visibility">Additional Visibility</string>
<string name="title_activity_Non_Work">Non-Work Reason</string>
</resources>