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

review

Browse Source
This commit is contained in:
ashishandroid
2017-02-14 12:35:20 +05:30
parent 02d0ad3e82
commit 6799680555
16 changed files with 170 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml
+23 -7
View File
@@ -41,12 +41,12 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_period"
@@ -61,7 +61,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_msl_availability"
@@ -76,7 +76,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_sos"
@@ -91,7 +91,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_t2p"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_promo"
@@ -121,12 +121,28 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_oss"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml
+24 -8
View File
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_category_wise_performance">
>
<LinearLayout
android:layout_width="match_parent"
@@ -41,12 +41,12 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_period"
@@ -61,7 +61,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_msl_availability"
@@ -76,7 +76,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_sos"
@@ -91,7 +91,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_t2p"
@@ -106,7 +106,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_promo"
@@ -121,12 +121,28 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_oss"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="@string/category_performance_PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
GSKMTOrange/src/main/res/layout/item_category_wise_performance.xml
+24 -7
View File
@@ -14,13 +14,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:id="@+id/txt_period"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Period"
@@ -36,7 +36,7 @@
android:id="@+id/txt_msl_availability"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="MSL Availability"
@@ -52,7 +52,7 @@
android:id="@+id/txt_sos"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="SOS"
@@ -68,7 +68,7 @@
android:id="@+id/txt_t2p"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="T2P"
@@ -84,7 +84,7 @@
android:id="@+id/txt_promo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Promo"
@@ -100,12 +100,29 @@
android:id="@+id/txt_oss"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="OSS"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:id="@+id/txt_planogram"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml
+25 -7
View File
@@ -14,13 +14,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="30">
android:weightSum="28">
<TextView
android:id="@+id/txt_period"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Period"
@@ -36,7 +36,7 @@
android:id="@+id/txt_msl_availability"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="MSL Availability"
@@ -52,7 +52,7 @@
android:id="@+id/txt_sos"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="SOS"
@@ -68,7 +68,7 @@
android:id="@+id/txt_t2p"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="T2P"
@@ -84,7 +84,7 @@
android:id="@+id/txt_promo"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="Promo"
@@ -100,12 +100,30 @@
android:id="@+id/txt_oss"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="OSS"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/colorPrimary" />
<TextView
android:id="@+id/txt_planogram"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="4"
android:gravity="center"
android:padding="5dp"
android:text="PLANOGRAM"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#000" />
</LinearLayout>
<View
GSKMTOrange/src/main/res/values-tr/string.xml
+2
View File
@@ -236,6 +236,8 @@
<string name="enter_the_values">Değerleri girin</string>
<string name="datanotfound">Içinde bulunmayan veri</string>
<string name="title_activity_fill_brand">Lütfen marka verilerini doldurun</string>
<string name="category_performance_PLANOGRAM">PLANOGRAM</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+3 -2
View File
@@ -129,12 +129,12 @@
<string name="promo_compliance_add">Add</string>
<string name="category_performance_period">Period</string>
<string name="category_performance_msl_availability">MSL Availability</string>
<string name="category_performance_msl_availability">MSL</string>
<string name="category_performance_sos">SOS</string>
<string name="category_performance_t2p">T2P</string>
<string name="category_performance_promo">Promo</string>
<string name="category_performance_oss">OSS</string>
<string name="category_performance_PLANOGRAM">Planogram</string>
<string name="category_performance_ltm">LTM</string>
<string name="category_performance_mtd">MTD</string>
<string name="category_performance_lsv">LSV</string>
@@ -267,4 +267,5 @@
<string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
<string name="datanotfound">Data not found in</string>
<string name="title_activity_t2p_brand__avaibility">T2pBrand_Avaibility</string>
<string name="title_activity_fill_brand">Please fill brand data</string>
</resources>