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

Merge branch 'master' into ysy_t2p_valid

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-18 15:27:50 +05:30
committed by GitHub
parent 5eb8b67f24 f544705714
commit ff799a122f
21 changed files with 812 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+3 -3
View File
@@ -30,7 +30,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="Brand Name"
android:text="@string/brandname"
android:textStyle="bold" />
<TextView
@@ -59,7 +59,7 @@
android:layout_height="match_parent"
android:layout_weight="10"
android:text="SKU Name"
android:text="@string/displayname"
android:textStyle="bold" />
<TextView
@@ -118,7 +118,7 @@
android:layout_marginLeft="30dp"
android:layout_weight="10"
android:background="@color/grey_background"
android:text="Delete" />
android:text="@string/delete" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+1 -1
View File
@@ -76,7 +76,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="#70888888"
android:background="@color/colorPrimaryDark"
android:orientation="vertical">
<TextView
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+6 -4
View File
@@ -154,14 +154,15 @@
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" />
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
@@ -228,6 +229,7 @@
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
android:visibility="gone"
>
GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml
+8 -2
View File
@@ -36,12 +36,18 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
<!-- <ImageView
android:id="@+id/img_planogram"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:src="@drawable/sad_cloud"/>
android:src="@drawable/sad_cloud" />-->
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout>