Deepak_commit_31_05_2018

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

@@ -47,7 +47,7 @@
             android:textStyle="bold" />
 
         <Spinner
-            android:id="@+id/spinner2"
+            android:id="@+id/spinner_reason"
             android:layout_width="match_parent"
             android:layout_height="50sp"
             android:layout_alignParentLeft="true"
@@ -87,10 +87,9 @@
         >
 
         <TextView
+            android:id="@+id/tv_remark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/reasontxt"
-
             android:paddingLeft="10dp"
             android:text="@string/Remark"
             android:textColor="@color/colorPrimary"
@@ -102,7 +101,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:ems="20" />
+            android:layout_below="@id/tv_remark"
+            android:ems="20"
+            />
+
+        <Spinner
+            android:id="@+id/spinner_sub_reason"
+            android:layout_width="match_parent"
+            android:layout_height="50sp"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/tv_remark"
+            android:layout_marginTop="5dp"
+            android:visibility="gone"
+            />
+
     </RelativeLayout>
 
 

GSKMTOrange/src/main/res/values-ar/string.xml

@@ -276,4 +276,7 @@
     <string name="adhoc">غير مخططة</string>
     <string name="hint_reply">أدخل الرد</string>
 
+    <string name="you_need_to_be_in_the_store">يجب ان تكون داخل المحل حتى تتمكن من فتح/اغلاق الزيارة</string>
+    <string name="distance_from_the_store">المسافة عن المحل</string>
+
 </resources>

GSKMTOrange/src/main/res/values-tr/string.xml

@@ -313,6 +313,10 @@
     <string name="adhoc">Ad hoc</string>
     <string name="hint_reply">cevap giriniz</string>
 
+    <!--Geofencing-->
+    <string name="you_need_to_be_in_the_store">Giriş/Çıkış yapmak için mağazada olmalısınız</string>
+    <string name="distance_from_the_store">Mağazadan uzaklık</string>
+
 </resources>
 
 

GSKMTOrange/src/main/res/values/strings.xml

@@ -369,7 +369,8 @@
     <string name="hint_reply">Type response</string>
 
     <!--Geofencing-->
-    <string name="you_need_to_be_in_the_store">You need to be in the store to Checkin/Checkout\n Distance from Store - </string>
+    <string name="you_need_to_be_in_the_store">You need to be in the store to Checkin/Checkout</string>
     <string name="distance_from_the_store">Distance from Store - </string>
+    <string name="meters">meters</string>
 
 </resources>