promo image

GSKMTOrange/build.gradle

@@ -15,8 +15,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 22
 
-        versionCode 10
+        versionCode 9
-        versionName "2.3"
+        versionName "2.2"
         
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java

@@ -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("");
                         }

GSKMTOrange/src/main/res/layout/spinner_text_view.xml

@@ -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>