add country code

app/build.gradle

@@ -72,7 +72,7 @@ android {
         vportal {
         vportal {
             applicationId "com.vsoft.vera.vportal"
             applicationId "com.vsoft.vera.vportal"
             versionCode 1
             versionCode 1
-            versionName "0.2.6"
+            versionName "0.2.9"
         }
         }
     }
     }
 }
 }

app/src/main/java/com/vsoft/vera/adapters/ChatMessageAdapter.java

@@ -494,7 +494,7 @@ public class ChatMessageAdapter extends RecyclerView.Adapter<ChatMessageAdapter.
                                 }
                                 }
 
 
 
 
-                            }else  if(message.contains("Ok, here's the link to the live agent:")) {
+                            }else  if(message.contains("Ok, here's the link to the live agent :")) {
 
 
                                 hr_text_layt.setVisibility(View.VISIBLE);
                                 hr_text_layt.setVisibility(View.VISIBLE);
                                 mHRMessageView.setVisibility(View.VISIBLE);
                                 mHRMessageView.setVisibility(View.VISIBLE);

app/src/main/java/com/vsoft/vera/api/managers/OtpApiManager.java

@@ -25,13 +25,13 @@ public class OtpApiManager {
 
 
     private static  String error = "Something went Wrong";
     private static  String error = "Something went Wrong";
 
 
-    public static void getOTP(String mobileNumber, PostOtpApiListener listener){
+    public static void getOTP(String mobileNumber, String countryCode,PostOtpApiListener listener){
         final Retrofit retrofit = RestClient.getInitializedRestAdapterWithOutAuthorizationHeader();
         final Retrofit retrofit = RestClient.getInitializedRestAdapterWithOutAuthorizationHeader();
 
 
         OtpPostData otpPostData = new OtpPostData();
         OtpPostData otpPostData = new OtpPostData();
         otpPostData.setPhone_number(mobileNumber);
         otpPostData.setPhone_number(mobileNumber);
         otpPostData.setVia("sms");
         otpPostData.setVia("sms");
-        otpPostData.setCountry_code(Constants.TWILIO_COUNTRY_CODE);
+        otpPostData.setCountry_code(countryCode);
 
 
         otpPostData.setLn("en");
         otpPostData.setLn("en");
 
 
@@ -94,12 +94,12 @@ public class OtpApiManager {
     }
     }
 
 
 
 
-    public static void validateOTP(String mobileNumber,String verificationCode, GetValidateOtpApiListener listener){
+    public static void validateOTP(String mobileNumber,String verificationCode,String countryCode, GetValidateOtpApiListener listener){
 
 
         final Retrofit retrofit = RestClient.getInitializedRestAdapterWithOutAuthorizationHeader();
         final Retrofit retrofit = RestClient.getInitializedRestAdapterWithOutAuthorizationHeader();
 
 
 
 
-        Call<ResponseBody> call = retrofit.create(OtpApi.class).validateOtp(mobileNumber,Constants.TWILIO_COUNTRY_CODE,verificationCode,"en");
+        Call<ResponseBody> call = retrofit.create(OtpApi.class).validateOtp(mobileNumber,countryCode,verificationCode,"en");
 
 
 
 
         try {
         try {

app/src/main/java/com/vsoft/vera/ui/ADALActivity.java

@@ -236,6 +236,7 @@ public class ADALActivity extends AppCompatActivity {
         }
         }
     }
     }
 
 
+
     private void CheckLoginValues() {
     private void CheckLoginValues() {
         String sysId = PrefManager.getSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_SYS_ID);
         String sysId = PrefManager.getSharedPref(ADALActivity.this, PrefManager.PREFERENCE_USER_SYS_ID);
         if (!TextUtils.isEmpty(sysId)) {
         if (!TextUtils.isEmpty(sysId)) {

app/src/main/java/com/vsoft/vera/ui/OtpValidationActivity.java

@@ -11,9 +11,12 @@ import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout;
+import android.widget.Spinner;
 import android.widget.Toast;
 import android.widget.Toast;
 
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Glide;
@@ -43,6 +46,7 @@ import com.vsoft.vera.utils.KeyboardUtil;
 import com.vsoft.vera.utils.PrefManager;
 import com.vsoft.vera.utils.PrefManager;
 import com.vsoft.vera.utils.Util;
 import com.vsoft.vera.utils.Util;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
@@ -65,6 +69,9 @@ public class OtpValidationActivity extends Activity {
     private List<UserApiValues> mUserDetails;
     private List<UserApiValues> mUserDetails;
     private  LinearLayout mainLayt;
     private  LinearLayout mainLayt;
     String userFullName;
     String userFullName;
+    Spinner country_spinner;
+    String[] country = { "US", "CAN", "IND"};
+    String countryCode="+1";
 
 
     @Override
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -72,6 +79,7 @@ public class OtpValidationActivity extends Activity {
         setContentView(R.layout.activity_otp_validation);
         setContentView(R.layout.activity_otp_validation);
 
 
         mainLayt = (LinearLayout) findViewById(R.id.activity_main_lyt);
         mainLayt = (LinearLayout) findViewById(R.id.activity_main_lyt);
+        country_spinner = findViewById(R.id.country_spinner);
         Glide.with(this).load(R.drawable.fulton_bg).into(new SimpleTarget<Drawable>() {
         Glide.with(this).load(R.drawable.fulton_bg).into(new SimpleTarget<Drawable>() {
             @Override
             @Override
             public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
             public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
@@ -84,7 +92,30 @@ public class OtpValidationActivity extends Activity {
         ButterKnife.bind(this);
         ButterKnife.bind(this);
         mApplication = (CatalogueApplication) getApplication();
         mApplication = (CatalogueApplication) getApplication();
 //        new LoginDetailsSendToServer().execute();
 //        new LoginDetailsSendToServer().execute();
+        //Creating the ArrayAdapter instance having the country list
+        ArrayAdapter aa = new ArrayAdapter(this,android.R.layout.simple_spinner_item,country);
+        aa.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        //Setting the ArrayAdapter data on the Spinner
+        country_spinner.setAdapter(aa);
 
 
+        country_spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                String selectedCountry = parent.getItemAtPosition(position).toString();
+                if(selectedCountry.equalsIgnoreCase("US")){
+                    countryCode = "+1";
+                }else if(selectedCountry.equalsIgnoreCase("CAN")){
+                    countryCode = "+1";
+                }else if(selectedCountry.equalsIgnoreCase("IND")){
+                    countryCode = "+91";
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
     }
     }
 
 
     @OnClick(R.id.otp_screen_text_view)
     @OnClick(R.id.otp_screen_text_view)
@@ -106,7 +137,7 @@ public class OtpValidationActivity extends Activity {
         } else if (!TextUtils.isEmpty(phoneString) && phoneString.length() >= 10 && phoneString.length() <=20) {
         } else if (!TextUtils.isEmpty(phoneString) && phoneString.length() >= 10 && phoneString.length() <=20) {
             KeyboardUtil.hideKeyboard(OtpValidationActivity.this);
             KeyboardUtil.hideKeyboard(OtpValidationActivity.this);
             if (mApplication.isNetConnected()) {
             if (mApplication.isNetConnected()) {
-                    new generateOtp().execute(phoneString);
+                    new generateOtp().execute(phoneString,countryCode);
             } else {
             } else {
                 DialogUtils.showNoConnectionDialog(OtpValidationActivity.this);
                 DialogUtils.showNoConnectionDialog(OtpValidationActivity.this);
             }
             }
@@ -122,7 +153,7 @@ public class OtpValidationActivity extends Activity {
             KeyboardUtil.hideKeyboard(OtpValidationActivity.this);
             KeyboardUtil.hideKeyboard(OtpValidationActivity.this);
 
 
             if (mApplication.isNetConnected()) {
             if (mApplication.isNetConnected()) {
-                new validateOtp().execute(phoneString, otpCode);
+                new validateOtp().execute(phoneString, otpCode,countryCode);
             } else {
             } else {
                 DialogUtils.showNoConnectionDialog(OtpValidationActivity.this);
                 DialogUtils.showNoConnectionDialog(OtpValidationActivity.this);
             }
             }
@@ -148,8 +179,9 @@ public class OtpValidationActivity extends Activity {
         protected Integer doInBackground(String... params) {
         protected Integer doInBackground(String... params) {
 
 
             String phoneString = params[0];
             String phoneString = params[0];
+            String countryCodeString = params[1];
 
 
-            OtpApiManager.getOTP(phoneString, new PostOtpApiListener() {
+            OtpApiManager.getOTP(phoneString,countryCodeString, new PostOtpApiListener() {
                 @Override
                 @Override
                 public void onDoneApiCall(String message) {
                 public void onDoneApiCall(String message) {
                      apiMessage = message;
                      apiMessage = message;
@@ -215,8 +247,9 @@ public class OtpValidationActivity extends Activity {
 
 
             String phoneString = params[0];
             String phoneString = params[0];
             String otpCode = params[1];
             String otpCode = params[1];
+            String countryCD = params[2];
 
 
-            OtpApiManager.validateOTP(phoneString, otpCode,new GetValidateOtpApiListener() {
+            OtpApiManager.validateOTP(phoneString, otpCode,countryCD,new GetValidateOtpApiListener() {
                 @Override
                 @Override
                 public void onDoneApiCall(String message) {
                 public void onDoneApiCall(String message) {
                     apiMessage = message;
                     apiMessage = message;

app/src/main/res/drawable-xxxhdpi/logout_spinner_dropdown_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<corners android:radius="3dp" />
+	<gradient
+		android:angle="90"
+		android:centerX="35%"
+		android:startColor="@android:color/transparent"
+		android:centerColor="@android:color/transparent"
+		android:endColor="@android:color/transparent"
+		android:type="linear" />
+	<stroke
+		android:width="1dp"
+		android:color="@color/button_bg" />
+</shape>
\ No newline at end of file

app/src/main/res/layout/activity_otp_validation.xml

@@ -44,25 +44,53 @@
         android:visibility="visible"
         android:visibility="visible"
         android:layout_height="match_parent">
         android:layout_height="match_parent">
 
 
+        <RelativeLayout
+            android:id="@+id/spinner_lyt"
+            android:layout_width="84dp"
+            android:layout_height="42dp"
+            android:layout_centerVertical="true"
+            android:layout_gravity="left"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/logout_spinner_dropdown_bg"
+            android:orientation="vertical">
+
+            <Spinner
+                android:id="@+id/country_spinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_gravity="center"
+                android:background="@android:color/transparent"
+                android:gravity="center"
+                android:popupBackground="#F0E2E2E2"
+                android:spinnerMode="dropdown"
+                android:textAlignment="center" />
+
+        </RelativeLayout>
 
 
         <android.support.design.widget.TextInputLayout
         <android.support.design.widget.TextInputLayout
             android:id="@+id/phone_layout"
             android:id="@+id/phone_layout"
-            android:layout_width="match_parent"
+            android:layout_width="320dp"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerInParent="true"
             android:layout_marginTop="0dp"
             android:layout_marginTop="0dp"
             android:layout_marginBottom="0dp"
             android:layout_marginBottom="0dp"
-            android:layout_centerVertical="true">
+            android:gravity="right">
+
             <EditText
             <EditText
                 android:id="@+id/otp_screen_phone_edit_text"
                 android:id="@+id/otp_screen_phone_edit_text"
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/extra_large_margin"
                 android:layout_marginLeft="@dimen/extra_large_margin"
                 android:layout_marginRight="@dimen/extra_large_margin"
                 android:layout_marginRight="@dimen/extra_large_margin"
+                android:layout_marginBottom="@dimen/extra_large_margin"
                 android:background="@drawable/username_under_bg_box"
                 android:background="@drawable/username_under_bg_box"
                 android:hint="@string/phone_number"
                 android:hint="@string/phone_number"
+                android:inputType="phone"
                 android:lines="1"
                 android:lines="1"
                 android:maxLength="20"
                 android:maxLength="20"
-                android:inputType="phone"
                 android:padding="@dimen/normal_margin"
                 android:padding="@dimen/normal_margin"
                 android:singleLine="true" />
                 android:singleLine="true" />
         </android.support.design.widget.TextInputLayout>
         </android.support.design.widget.TextInputLayout>

app/src/main/res/values/dimen.xml

@@ -24,7 +24,7 @@
     <dimen name="small_margin">5dp</dimen>
     <dimen name="small_margin">5dp</dimen>
     <dimen name="normal_margin">10dp</dimen>
     <dimen name="normal_margin">10dp</dimen>
     <dimen name="large_margin">15dp</dimen>
     <dimen name="large_margin">15dp</dimen>
-    <dimen name="extra_large_margin">20dp</dimen>
+    <dimen name="extra_large_margin">10dp</dimen>
 
 
     <!--Text size-->
     <!--Text size-->
     <dimen name="ruquest_status_text_size">15sp</dimen>
     <dimen name="ruquest_status_text_size">15sp</dimen>

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

@@ -165,6 +165,13 @@
         <item>Insufficient permissions</item>
         <item>Insufficient permissions</item>
     </string-array>
     </string-array>
 
 
+    <string-array name="country_arrays">
+        <item>US</item>
+        <item>IND</item>
+        <item>CAN</item>
+
+    </string-array>
+
     <!--home Screen Option-->
     <!--home Screen Option-->
     <!--Start-->
     <!--Start-->
     <string name="home_screen_report_incident_title">Report Incident</string>
     <string name="home_screen_report_incident_title">Report Incident</string>

app/vportal/staging/output.json

-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.2.6","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.2.9","enabled":true,"outputFile":"app-vportal-staging.apk","fullName":"vportalStaging","baseName":"vportal-staging"},"path":"app-vportal-staging.apk","properties":{}}]
\ No newline at end of file