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

promo image

Browse Source
This commit is contained in:
gagangoel290
2017-05-03 12:33:51 +05:30
parent 0c150a659f
commit a0587de83e
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+2 -2
View File
@@ -15,8 +15,8 @@ android {
minSdkVersion 15
targetSdkVersion 22
versionCode 10
versionName "2.3"
versionCode 9
versionName "2.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+7 -4
View File
@@ -203,6 +203,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
}
} else {
cd.setIn_stock("0");
img_addPromotion.setClickable(false);
img_addPromotion.setBackgroundResource(R.mipmap.camera_grey);
}
}
@@ -271,7 +272,6 @@ public class PromoComplianceActivity extends AppCompatActivity {
}
});
for (int i = 0; i < promoSpinnerListData.size(); i++) {
if (cd.getSp_promo() == promoSpinnerListData.get(i).getPromo_id()) {
sp_promo.setSelection(i);
@@ -414,6 +414,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
for (int i = 0; i < promoSpinnerListData.size(); i++) {
sp_promo_adapter.add(promoSpinnerListData.get(i).getPromo());
}
sp_promo_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
//sp_promo_adapter.setDropDownViewResource(R.layout.spinner_text_view);
sp_promo.setAdapter(sp_promo_adapter);
} catch (Exception e) {
e.printStackTrace();
@@ -467,6 +469,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
}
} else {
data.setIn_stock("0");
img_promotion.setClickable(false);
img_promotion.setBackgroundResource(R.mipmap.camera_grey);
data.setImage_promotion("");
}
@@ -564,7 +567,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
TextView txt_inStock = (TextView) view.findViewById(R.id.txt_inStock);
TextView txt_promoAnnouncer = (TextView) view.findViewById(R.id.txt_promoAnnouncer);
TextView txt_runningPos = (TextView) view.findViewById(R.id.txt_runningPos);
ImageView img_add_promotion_view= (ImageView) view.findViewById(R.id.img_add_promotion_view);
ImageView img_add_promotion_view = (ImageView) view.findViewById(R.id.img_add_promotion_view);
txt_promoName.setText(data.getPromo());
@@ -590,9 +593,9 @@ public class PromoComplianceActivity extends AppCompatActivity {
}
//Camera Image
if(!data.getImage_promotion().equals("")){
if (!data.getImage_promotion().equals("")) {
img_add_promotion_view.setBackgroundResource(R.mipmap.camera_green);
}else{
} else {
img_add_promotion_view.setBackgroundResource(R.mipmap.camera_orange);
}
GSKMTOrange/src/main/res/layout/spinner_text_view.xml
+16
View File
@@ -0,0 +1,16 @@
<?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">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingTop="5dp"
android:text="Text"
android:textSize="15dp" />
</LinearLayout>