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

Geo tag and promo image

Browse Source
This commit is contained in:
gagangoel290
2017-05-02 18:20:28 +05:30
parent 86745ade06
commit 0c150a659f
14 changed files with 985 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+32 -9
View File
@@ -90,16 +90,39 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal"
android:weightSum="2">
<Button
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginRight="30dp"
android:background="@color/grey_background"
android:text="@string/delete" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="15dp">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/camera_green" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginRight="30dp"
android:background="@color/grey_background"
android:text="@string/delete" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+34 -9
View File
@@ -252,17 +252,42 @@
android:layout_height="0dp"
android:layout_marginTop="5dp"
android:layout_weight="1"
android:orientation="vertical"
android:paddingRight="15dp">
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingRight="15dp"
android:weightSum="1">
<Button
android:id="@+id/btn_add"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/lin_promotion"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".5"
android:orientation="vertical">
<ImageView
android:id="@+id/img_addPromotion"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_gravity="center"
android:layout_margin="5dp" />
<!--android:src="@mipmap/camera_grey"-->
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/colorPrimaryDark"
android:text="@string/promo_compliance_add"
android:textColor="@color/white" />
android:layout_weight=".5"
android:orientation="vertical">
<Button
android:id="@+id/btn_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/colorPrimaryDark"
android:text="@string/promo_compliance_add"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/geotagstorelist.xml
+26 -12
View File
@@ -13,10 +13,10 @@
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"
@@ -24,12 +24,10 @@
<RelativeLayout
android:id="@+id/relativelayout"
android:layout_width="fill_parent"
android:layout_height="55dp"
android:layout_marginBottom="1sp"
android:padding="10sp">
<ImageView
@@ -42,16 +40,32 @@
android:paddingTop="5sp"
android:src="@mipmap/store" />
<TextView
android:id="@+id/geolistviewxml_storename"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/geolistviewxml_storeico"
android:layout_toRightOf="@+id/geolistviewxml_storeico"
android:text="GSK MT ORANGE STORE"
android:textColor="#1F3A6C"
android:textSize="12sp"
android:textStyle="bold" />
android:orientation="vertical">
<TextView
android:id="@+id/geolistviewxml_storename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="GSK MT ORANGE STORE"
android:textColor="#1F3A6C"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/txt_storeAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="STORE Address"
android:textColor="#1F3A6C"
android:textSize="12sp"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/imageView1"
@@ -60,8 +74,8 @@
android:layout_alignBottom="@+id/geolistviewxml_storeico"
android:layout_alignParentRight="true"
android:background="@mipmap/geopin"
android:visibility="gone"/>
android:visibility="gone" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+43 -2
View File
@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<!-- <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
@@ -28,7 +28,48 @@
android:paddingTop="5dp"
android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
android:textColor="@color/black" />-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".8"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_promotion"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".2"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/img_add_promotion_view"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp" />
<!--android:src="@mipmap/camera_grey"-->
</LinearLayout>
</LinearLayout>
<!--Promo sku name-->
<LinearLayout
GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml
+38 -7
View File
@@ -17,15 +17,46 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
android:orientation="horizontal"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".8"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingTop="5dp"
android:text="@string/promo_compliance_promos_sku"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/black" />
</LinearLayout>
<LinearLayout
android:id="@+id/lin_promotion"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".2"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/img_promotion"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp" />
<!--android:src="@mipmap/camera_grey"-->
</LinearLayout>
</LinearLayout>
<!--Promo sku name-->
<LinearLayout