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

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-13 12:12:46 +05:30
parent e4a80d6e1b
commit a9f187943c
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+1 -2
View File
@@ -400,8 +400,6 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
holder.cardView = (CardView) convertView.findViewById(R.id.card_view); holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq);
holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available);
@@ -414,6 +412,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
holder = (ViewHolder) convertView.getTag(); holder = (ViewHolder) convertView.getTag();
} }
holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
holder.txt_skuName.setText(childData.getSku()); holder.txt_skuName.setText(childData.getSku());
holder.txt_mbq.setText(childData.getMbq()); holder.txt_mbq.setText(childData.getMbq());
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+7 -7
View File
@@ -157,9 +157,9 @@
android:id="@+id/toggle_add_InStock" android:id="@+id/toggle_add_InStock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no" android:textOff="@string/no"
android:textOn="@string/yes" android:textOn="@string/yes"/>
android:background="@drawable/toggle_selector_background"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -196,9 +196,9 @@
android:id="@+id/toggle_add_promoAnnouncer" android:id="@+id/toggle_add_promoAnnouncer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no" android:textOff="@string/no"
android:textOn="@string/yes" android:textOn="@string/yes" />
android:background="@drawable/toggle_selector_background" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -235,9 +235,9 @@
android:id="@+id/toggle_add_runningPos" android:id="@+id/toggle_add_runningPos"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no" android:textOff="@string/no"
android:textOn="@string/yes" android:textOn="@string/yes" />
android:background="@drawable/toggle_selector_background" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -255,7 +255,7 @@
android:id="@+id/btn_add" android:id="@+id/btn_add"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="center"
android:background="@color/colorPrimaryDark" android:background="@color/colorPrimaryDark"
android:text="@string/promo_compliance_add" android:text="@string/promo_compliance_add"
android:textColor="@color/white" /> android:textColor="@color/white" />
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2
View File
@@ -77,6 +77,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:hint="@string/stock_facing_stock"
android:inputType="number" android:inputType="number"
android:maxLength="7" android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
@@ -105,6 +106,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:hint="@string/stock_facing_faceup"
android:inputType="number" android:inputType="number"
android:maxLength="7" android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"