Merge pull request #41 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_new

T2P upload data new
2017-01-12 17:55:18 +05:30
parent 53d0eac19a 1f34b4fd91
commit 4c243ab49b
37 changed files with 323 additions and 183 deletions
@@ -41,7 +41,7 @@
    <ConfirmationsSetting value="0" id="Add" />
    <ConfirmationsSetting value="0" id="Remove" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
@@ -14,7 +14,7 @@

    <application
        android:allowBackup="true"
-        android:icon="@drawable/icon"
+        android:icon="@drawable/gsklogo"
        android:label="@string/app_name"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
@@ -34,7 +34,7 @@
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".MainActivity"
-            android:label="@string/app_name"
+            android:label="@string/main_menu_activity_name"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
@@ -60,7 +60,7 @@
        <activity
            android:name=".dailyentry.StoreimageActivity"
            android:configChanges="screenSize|orientation|keyboardHidden"
-            android:label="@string/title_activity_store_list_geotag"
+            android:label="@string/title_activity_store_image"
            android:screenOrientation="portrait"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
@@ -279,7 +279,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
        try {


-            dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID  INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON  BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1') As Brand", null);
+            dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID  INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON  BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1' ORDER BY  SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE) As Brand", null);
            if (dbcursor != null) {

                dbcursor.moveToFirst();
@@ -1674,6 +1674,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
            dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN  " +
                    "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);

+
            if (dbcursor != null) {
                dbcursor.moveToFirst();
                while (!dbcursor.isAfterLast()) {
@@ -133,9 +133,9 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
    @Override
    public void onBackPressed() {
        // TODO Auto-generated method stub
-        Intent intent = new Intent(GeoTagStoreList.this, MainActivity.class);
+       /* Intent intent = new Intent(GeoTagStoreList.this, MainActivity.class);

-        startActivity(intent);
+        startActivity(intent);*/
        GeoTagStoreList.this.finish();
    }

@@ -115,6 +115,19 @@ public class LoginActivity extends AppCompatActivity {

        setContentView(R.layout.activity_login);

+        TextView tv_version = (TextView) findViewById(R.id.tv_version_code);
+
+        try {
+            app_ver =String.valueOf(getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
+
+            // login_version.setText("Parinaam Version " + app_ver);
+        } catch (PackageManager.NameNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+        tv_version.setText("Version/Versiyon - " + app_ver);
+
        preferences = PreferenceManager.getDefaultSharedPreferences(this);
        editor = preferences.edit();

@@ -267,7 +267,7 @@ public class MainActivity extends AppCompatActivity

            //startActivity(new Intent(MainActivity.this, CategoryListActivity.class));

-        } else if (id == R.id.nav_export) {
+        } /*else if (id == R.id.nav_export) {

            AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this);
            builder1.setMessage("Are you sure you want to take the backup of your data")
@@ -276,12 +276,12 @@ public class MainActivity extends AppCompatActivity
                        @SuppressWarnings("resource")
                        public void onClick(DialogInterface dialog, int id) {
                            try {
-                                /*File file = new File(Environment
+                                *//*File file = new File(Environment
                                        .getExternalStorageDirectory(),
                                        "capital_backup");
                                if (!file.isDirectory()) {
                                    file.mkdir();
-                                }*/
+                                }*//*

                                File sd = Environment.getExternalStorageDirectory();
                                File data = Environment.getDataDirectory();
@@ -324,7 +324,7 @@ public class MainActivity extends AppCompatActivity
                    });
            AlertDialog alert1 = builder1.create();
            alert1.show();
-        }
+        }*/

        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
        drawer.closeDrawer(GravityCompat.START);
@@ -108,7 +108,7 @@ public class NonWorkingReason extends AppCompatActivity implements
        reason_adapter = new ArrayAdapter<CharSequence>(this,
                android.R.layout.simple_spinner_item);

-        reason_adapter.add("Select Reason");
+        reason_adapter.add(getResources().getString(R.string.select_reason));

        for (int i = 0; i < reasondata.size(); i++) {
            reason_adapter.add(reasondata.get(i).getREASON().get(0));
@@ -171,6 +171,143 @@ public class T2PComplianceActivity extends AppCompatActivity {

    }

+
+    public class T2PAdapter extends RecyclerView.Adapter<T2PAdapter.ViewHolder> {
+
+        private ArrayList<T2PGetterSetter> list;
+
+        public T2PAdapter(ArrayList<T2PGetterSetter> t2PList) {
+            list = t2PList;
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.t2p_item_layout, parent, false);
+            return new ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(final ViewHolder holder, final int position) {
+
+            final T2PGetterSetter mItem = list.get(position);
+            holder.tv_brand.setText(mItem.getBrand());
+            holder.tv_display.setText(mItem.getDisplay().trim());
+
+            //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME));
+
+           /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME);
+            FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont);
+*/
+            holder.btn_gaps.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    showGapsDialog(mItem);
+
+                }
+            });
+
+            holder.toggle_btn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes)));
+
+                    t2PAdapter.notifyDataSetChanged();
+                }
+            });
+
+
+            holder.btn_sku.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    showSkuDialog(mItem.getSkulist());
+                }
+            });
+
+            if (!img.equalsIgnoreCase("")) {
+                if (position == child_position) {
+                    mItem.setImage(img);
+                    img = "";
+                }
+            }
+
+            if(camera_allow.equals("1")){
+
+                holder.img_cam.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        _pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+                        child_position = position;
+                        path = str + _pathforcheck;
+
+                        startCameraActivity();
+                    }
+                });
+
+                if (mItem.getImage().equals("")) {
+                    holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+                } else {
+                    holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
+                }
+            }
+            else {
+                holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
+            }
+
+
+            holder.toggle_btn.setChecked(mItem.isPresent());
+
+            if (mItem.getGapsChecklist().size() > 0) {
+                holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green));
+            } else {
+                holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            }
+
+            if (mItem.getSkulist().size() > 0) {
+                holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
+            } else {
+                holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            }
+
+        }
+
+        @Override
+        public int getItemCount() {
+            return list.size();
+        }
+
+        public class ViewHolder extends RecyclerView.ViewHolder {
+            public final View mView;
+            public final LinearLayout parentLayout;
+            public final TextView tv_brand, tv_display;
+            public final ImageView img_cam, img_remark;
+            public final Button btn_gaps, btn_sku, btn_ref_img;
+            public final ToggleButton toggle_btn;
+
+
+            public ViewHolder(View view) {
+                super(view);
+
+                mView = view;
+
+                tv_brand = (TextView) mView.findViewById(R.id.tv_brand);
+                tv_display = (TextView) mView.findViewById(R.id.tv_display);
+                img_cam = (ImageView) mView.findViewById(R.id.img_cam);
+                img_remark = (ImageView) mView.findViewById(R.id.img_remark);
+                btn_gaps = (Button) mView.findViewById(R.id.btn_gaps);
+                btn_sku = (Button) mView.findViewById(R.id.btn_sku);
+                btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image);
+                parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout);
+                toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn);
+
+            }
+
+        }
+    }
+
+
    public void showGapsDialog(final T2PGetterSetter t2p) {

        final ArrayList<GapsChecklistGetterSetter> gapsChecklist;
@@ -267,7 +404,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                    spinner_brand.setSelection(0);

                    SkuGetterSetter select = new SkuGetterSetter();
-                    select.setSKU("Select");
+                    select.setSKU(getString(R.string.select));
                    sku_list.clear();
                    sku_list.add(select);
                    CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list);
@@ -299,7 +436,7 @@ public class T2PComplianceActivity extends AppCompatActivity {


        SkuGetterSetter select = new SkuGetterSetter();
-        select.setSKU("Select");
+        select.setSKU(getString(R.string.select));
        sku_list.add(select);
        CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list);
        spinner_sku.setAdapter(skuadapter);
@@ -324,7 +461,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                    }

                    SkuGetterSetter select = new SkuGetterSetter();
-                    select.setSKU("Select");
+                    select.setSKU(getString(R.string.select));
                    sku_list.add(0, select);
                    // Create custom adapter object ( see below CustomSkuAdapter.java )
                    CustomSkuAdapter skuadapter = new CustomSkuAdapter(T2PComplianceActivity.this, R.layout.custom_spinner_item, sku_list);
@@ -137,7 +137,7 @@ public class DownloadActivity extends AppCompatActivity {
                data = new Data();

                data.value = 10;
-                data.name = "JCP Data Downloading";
+                data.name = "JCP "+getResources().getString(R.string.download_data);
                publishProgress(data);

                XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
@@ -178,7 +178,7 @@ public class DownloadActivity extends AppCompatActivity {
                    }

                    data.value = 10;
-                    data.name = "JCP Data Downloading";
+                    data.name = "JCP "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -214,7 +214,7 @@ public class DownloadActivity extends AppCompatActivity {
                    }

                    data.value = 20;
-                    data.name = "SKU_MASTER Data Download";
+                    data.name = "SKU_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -250,7 +250,7 @@ public class DownloadActivity extends AppCompatActivity {
                    }

                    data.value = 30;
-                    data.name = "BRAND_MASTER Data Download";
+                    data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -285,7 +285,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "SUB_CATEGORY_MASTER";
                    }
                    data.value = 40;
-                    data.name = "SUB_CATEGORY_MASTER Data Download";
+                    data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -320,7 +320,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "CATEGORY_MASTER";
                    }
                    data.value = 50;
-                    data.name = "CATEGORY_MASTER Data Download";
+                    data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -355,7 +355,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "DISPLAY_MASTER";
                    }
                    data.value = 60;
-                    data.name = "DISPLAY_MASTER Data Download";
+                    data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -390,7 +390,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "MAPPING_STOCK";
                    }
                    data.value = 80;
-                    data.name = "MAPPING_STOCK Data Download";
+                    data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -425,7 +425,7 @@ public class DownloadActivity extends AppCompatActivity {
                        //return "MAPPING_T2P";
                    }
                    data.value = 100;
-                    data.name = "MAPPING_T2P Data Download";
+                    data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -459,7 +459,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "DISPLAY_CHECKLIST_MASTER";
                    }
                    data.value = 100;
-                    data.name = "DISPLAY_CHECKLIST_MASTER Data Download";
+                    data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -493,7 +493,7 @@ public class DownloadActivity extends AppCompatActivity {
                        //return "MAPPING_DISPLAY_CHECKLIST";
                    }
                    data.value = 100;
-                    data.name = "MAPPING_DISPLAY_CHECKLIST Data Download";
+                    data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -528,7 +528,7 @@ public class DownloadActivity extends AppCompatActivity {
                        return "NON_WORKING_REASON";
                    }
                    data.value = 100;
-                    data.name = "NON_WORKING_REASON Data Download";
+                    data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -563,7 +563,7 @@ public class DownloadActivity extends AppCompatActivity {
                        //return "MAPPING_PROMOTION";
                    }*/
                    data.value = 100;
-                    data.name = "MAPPING_PROMOTION Data Download";
+                    data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -601,7 +601,7 @@ public class DownloadActivity extends AppCompatActivity {
                        //return "MAPPING_ADDITIONAL_PROMOTION";
                    }*/
                    data.value = 100;
-                    data.name = "MAPPING_ADDITIONAL_PROMOTION Data Download";
+                    data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data);
                }
                publishProgress(data);

@@ -654,6 +654,8 @@ public class UploadActivity extends AppCompatActivity {
                                    }

                                    gaps_child = "[GAPS]"
+                                            + "[MID]" + mid + "[/MID]"
+                                            + "[USER_ID]" + userId + "[/USER_ID]"
                                            + "[CHECK_LIST_ID]"
                                            + gapsList.get(l).getChecklist_id()
                                            + "[/CHECK_LIST_ID]"
@@ -663,6 +665,9 @@ public class UploadActivity extends AppCompatActivity {
                                            + "[PRESENT]"
                                            + present
                                            + "[/PRESENT]"
+                                            + "[COMMON_ID]"
+                                            + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+                                            + "[/COMMON_ID]"
                                            + "[/GAPS]";
                                    gaps_xml = gaps_xml + gaps_child;
                                }
@@ -673,6 +678,8 @@ public class UploadActivity extends AppCompatActivity {
                                for (int k = 0; k < skuList.size(); k++) {

                                    sku_child = "[SKU]"
+                                            + "[MID]" + mid + "[/MID]"
+                                            + "[USER_ID]" + userId + "[/USER_ID]"
                                            + "[SKU_ID]"
                                            + skuList.get(k).getSKU_ID()
                                            + "[/SKU_ID]"
@@ -682,6 +689,9 @@ public class UploadActivity extends AppCompatActivity {
                                            + "[STOCK]"
                                            + skuList.get(k).getSTOCK()
                                            + "[/STOCK]"
+                                            + "[COMMON_ID]"
+                                            + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+                                            + "[/COMMON_ID]"
                                            + "[/SKU]";
                                    sku_xml = sku_xml + sku_child;
                                }
@@ -810,6 +820,31 @@ public class UploadActivity extends AppCompatActivity {
                        }


+                        for(int m=0;m<t2PGetterSetters.size();m++){
+
+                            if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) {
+                                if (new File(CommonString.FILE_PATH + t2PGetterSetters.get(m).getImage()).exists()) {
+
+                                    try {
+                                        result = UploadImage(t2PGetterSetters.get(m).getImage(), "T2PImages");
+                                        if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+                                            return "T2PImages";
+                                        }
+
+                                        runOnUiThread(new Runnable() {
+                                            public void run() {
+                                                message.setText("T2P Images Uploaded");
+                                            }
+                                        });
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+
+                        }
+
+
                        // SET COVERAGE STATUS
                        String final_xml = "";
                        onXML = "";
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:drawable="@color/grey_background"  />
-    <item android:state_checked="true" android:drawable="@color/green"  />
+    <item android:state_checked="false" android:drawable="@drawable/toggle_grey"  />
+    <item android:state_checked="true" android:drawable="@drawable/toggle_green"  />
 </selector>
@@ -1,80 +1,3 @@
-<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="cpm.com.gskmtorange.LoginActivity">
-
-    &lt;!&ndash; Login progress &ndash;&gt;
-    <ProgressBar
-        android:id="@+id/login_progress"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone" />
-
-    <ScrollView
-        android:id="@+id/login_form"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/email_login_form"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <AutoCompleteTextView
-                    android:id="@+id/userid"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_userid"
-                    android:inputType="textEmailAddress"
-                    android:maxLines="1"
-                    android:singleLine="true" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <android.support.design.widget.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <EditText
-                    android:id="@+id/password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/prompt_password"
-                    android:imeActionId="@+id/login"
-                    android:imeActionLabel="@string/action_sign_in_short"
-                    android:imeOptions="actionUnspecified"
-                    android:inputType="textPassword"
-                    android:maxLines="1"
-                    android:singleLine="true" />
-
-            </android.support.design.widget.TextInputLayout>
-
-            <Button
-                android:id="@+id/user_login_button"
-                style="?android:textAppearanceSmall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:text="@string/action_sign_in"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>-->

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -119,7 +42,7 @@

                <ImageView
                    android:layout_width="match_parent"
-                    android:layout_height="50dp"
+                    android:layout_height="45dp"

                    android:layout_centerInParent="true"
                    android:layout_gravity="center_vertical"
@@ -207,11 +130,11 @@
                <ImageView

                    android:id="@+id/gsklogo"
-                    android:layout_width="167dp"
-                    android:layout_height="113dp"
+                    android:layout_width="115dp"
+                    android:layout_height="100dp"

                    android:layout_centerInParent="true"
-                    android:background="@drawable/gsk_logo"></ImageView>
+                    android:background="@drawable/gsklogo"></ImageView>

            </RelativeLayout>

@@ -226,7 +149,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerInParent="true"
-                    android:text="Version"
+                    android:text="Version/Versiyon"
                    android:textSize="@dimen/text_size_normal" />

            </RelativeLayout>
@@ -34,10 +34,10 @@

        <ImageView
            android:id="@+id/logo"
-            android:layout_width="300dp"
-            android:layout_height="204dp"
+            android:layout_width="153dp"
+            android:layout_height="133dp"
            android:layout_centerHorizontal="true"
-            android:background="@drawable/gsk_logo" />
+            android:background="@drawable/gsklogo" />

    </RelativeLayout>

@@ -24,5 +24,4 @@
    <include layout="@layout/contentstoreimage" />


-
 </android.support.design.widget.CoordinatorLayout>
@@ -21,7 +21,7 @@
            android:paddingBottom="10dp"
            android:paddingLeft="20dp"
            android:paddingTop="10dp"
-            android:text="Daily Data Menu"
+            android:text="@string/daily_activity_menu"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textColor="@android:color/black"
            android:visibility="gone"/>
@@ -49,11 +49,12 @@

            <ImageView
                android:id="@+id/img_main"
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_width="153dp"
+                android:layout_height="133dp"
                android:layout_marginLeft="5dp"
                android:layout_marginRight="5dp"
-                android:src="@drawable/gsk_logo"
+                android:src="@drawable/gsklogo"
+                android:layout_centerInParent="true"
                />

            <WebView
@@ -13,7 +13,10 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">

        <TextView
            android:id="@+id/txt_promoComplianceName"
@@ -24,7 +24,7 @@
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="Click Store Front Image"
+            android:text="@string/store_image"
            android:textSize="@dimen/store_entry_text_size"
            android:layout_centerInParent="true"
            android:textColor="@color/white"
@@ -79,7 +79,7 @@
                android:id="@+id/img_cam_selfie"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:background="@mipmap/camera_icon_done"
+                android:background="@mipmap/camera_orange"
                android:layout_centerInParent="true"
                />

@@ -28,7 +28,7 @@
                android:layout_alignParentLeft="true"
                android:layout_marginTop="15dp"
                android:paddingLeft="5dp"
-                android:text="Downloading Data"
+                android:text="@string/download_data"
                android:textSize="@dimen/text_size_normal"
                android:paddingBottom="20dp"
                android:textColor="@color/white"
@@ -9,7 +9,7 @@
    <TextView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:text="Store Visited"
+        android:text="@string/store_visited"
        android:textColor="@color/black"
        android:textSize="25sp" />

@@ -28,7 +28,7 @@
            android:id="@+id/yes"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="Yes"
+            android:text="@string/yes"
            android:textColor="#000000" 
             android:background="@color/colorPrimary"/>

@@ -42,7 +42,7 @@
            android:id="@+id/no"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:text="No"
+            android:text="@string/no"
            android:textColor="#000000" 
            android:background="@color/colorPrimary"/>
    </RadioGroup>
@@ -91,7 +91,7 @@
                    <ToggleButton
                        android:id="@+id/toggle_available"
                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="70dp"
                        android:layout_gravity="center"
                        android:background="@drawable/toggle_selector_background"
                        android:textOff="@string/no"
@@ -24,7 +24,7 @@
        android:layout_width="match_parent"
        android:layout_height="60dp"
        android:layout_marginTop="5dp"
-        android:src="@drawable/gsk_logo" />
+        android:src="@drawable/gsklogo" />

    <TextView
        android:id="@+id/nav_user_name"
@@ -41,7 +41,7 @@
            android:layout_alignParentLeft="true"
            android:layout_marginLeft="3sp"
            android:layout_marginTop="20dp"
-            android:text="Reason"
+            android:text=""
            android:textColor="@color/colorPrimary"
            android:textSize="18sp"
            android:textStyle="bold" />
@@ -91,8 +91,8 @@
                        android:id="@+id/toggle_btn"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                        android:textOn="Yes"
-                        android:textOff="No"
+                        android:textOn="@string/yes"
+                        android:textOff="@string/no"
                        android:background="@drawable/toggle_selector_background"
                        android:layout_centerInParent="true"/>

@@ -127,9 +127,10 @@
                        android:layout_height="50dp"
                        android:text="@string/image"
                        android:layout_weight="1"
-                        android:layout_centerInParent="true"
-                        android:background="@drawable/cam_active"
-                        android:padding="@dimen/custom_margin"/>
+                        android:background="@mipmap/camera_orange"
+                        android:padding="@dimen/custom_margin"
+                        android:layout_alignParentTop="true"
+                        android:layout_centerHorizontal="true" />

                </RelativeLayout>

@@ -137,7 +138,8 @@
                <RelativeLayout
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:visibility="gone">

                    <ImageView
                        android:id="@+id/img_remark"
@@ -4,28 +4,24 @@
    <group android:checkableBehavior="single">
        <item
            android:id="@+id/nav_route_plan"
-            android:icon="@drawable/ic_menu_gallery"
+            android:icon="@mipmap/entry_grey"
            android:title="@string/menu_daily_route_plan" />
        <item
            android:id="@+id/nav_download"
-            android:icon="@drawable/ic_menu_slideshow"
+            android:icon="@mipmap/download_grey"
            android:title="@string/menu_daily_download" />
        <item
            android:id="@+id/nav_upload"
-            android:icon="@drawable/ic_menu_manage"
+            android:icon="@mipmap/upload_grey"
            android:title="@string/menu_upload_data" />
        <item
            android:id="@+id/nav_geotag"
-            android:icon="@drawable/ic_menu_manage"
+            android:icon="@mipmap/geotag_grey"
            android:title="@string/menu_geotag" />
-        <item
-            android:id="@+id/nav_export"
-            android:icon="@drawable/ic_menu_share"
-            android:title="@string/menu_export" />

        <item
            android:id="@+id/nav_exit"
-            android:icon="@drawable/ic_menu_send"
+            android:icon="@mipmap/exit_grey"
            android:title="@string/menu_exit" />
    </group>

@@ -33,11 +29,11 @@
        <menu>
            <item
                android:id="@+id/nav_setting"
-                android:icon="@drawable/ic_menu_manage"
+                android:icon="@mipmap/settings_grey"
                android:title="@string/menu_setting" />
            <item
                android:id="@+id/nav_services"
-                android:icon="@drawable/ic_menu_send"
+                android:icon="@mipmap/services_grey"
                android:title="@string/menu_services" />
        </menu>
    </item>
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="prompt_email">E-posta</string>
-    <string name="prompt_password">Şifre (isteğe bağlı)</string>
-    <string name="action_sign_in">Giriş yapın veya kayıt olun</string>
    <string name="action_sign_in_short">oturum aç</string>
    <string name="error_invalid_email">Bu e-posta adresi geçersiz</string>
    <string name="error_invalid_password">Bu şifre çok kısa</string>
@@ -26,6 +24,7 @@
    <string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
    <string name="title_geo_tag_activity_geo_data">Store Geo Data Uploaded</string>
    <string name="title_geo_tag_activity_geo_already_done">Store Already Geotagged</string>
+    <string name="main_menu_activity_name">GSK Turuncu Mağaza</string>

    <string name="save">Sakla</string>

@@ -38,7 +37,7 @@
    <string name="present">Teşhir var mı?</string>
    <string name="add">Ekle</string>

-    <string name="select">Seç</string>
+    <string name="select">Seçiniz</string>

    <string name="title_activity_t2_pcompliance">Kalıcı Teşhir</string>

@@ -46,6 +45,27 @@
    <string name="no">Hayır</string>

    <string name="title_activity_upload">Veri Paylaş</string>
+    <string name="download_data">Veri Indir</string>
+    <string name="store_visited">Mağaza ziyaret edildi mi?</string>
+    <string name="store_image">Mağaza girişinin fotoğrafını çekiniz</string>
+
+    <string name="title_activity_store_image">Mağaza Girişi Fotoğrafı</string>
+    <string name="title_activity_Non_Work">Çalışmama Sebebi</string>
+    <string name="reason">Sebep</string>
+    <string name="select_reason">Bir sebep seçiniz</string>
+    <string name="daily_activity_menu">Günlük Veri Menüsü</string>
+
+    <string name="daily_data_menu_msl_availability">Bulunurluk</string>
+    <string name="daily_data_menu_stock_facing">Raf Payı</string>
+    <string name="daily_data_menu_t2p">Kalıcı Teşhir</string>
+    <string name="daily_data_menu_additional_visibility">Ek Teşhir</string>
+    <string name="daily_data_menu_promo_compliance">Promosyon</string>
+    <string name="daily_data_menu_competition_tracking">Rakip Bilgisi</string>
+    <string name="daily_data_menu_additional_promotions">Competition Promo</string>
+    <string name="closed">kapalı</string>
+
+    <string name="title_activity_promo_compliance">Promosyon</string>
+

    <!--Gagan Start Code -->
    <string name="title_activity_category_list">Kategoriler</string>
@@ -1,5 +1,6 @@
 <resources>
-    <string name="app_name">GSKMTOrange</string>
+    <string name="app_name">GSK MT Orange</string>
+    <string name="main_menu_activity_name">GSK Orange Stores</string>

    <string name="navigation_drawer_open">Open navigation drawer</string>
    <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -9,9 +10,9 @@

    <!-- Strings related to login -->
    <string name="prompt_email">E Mail</string>
-    <string name="prompt_userid">User Id</string>
-    <string name="prompt_password">Password</string>
-    <string name="action_sign_in">Login</string>
+    <string name="prompt_userid">Username/Kullanıcı Adı</string>
+    <string name="prompt_password">Password/Şifre</string>
+    <string name="action_sign_in">Login/Giriş Yap</string>
    <string name="action_sign_in_short">Sign in</string>
    <string name="error_invalid_email">This email address is invalid</string>
    <string name="error_invalid_password">This password is too short</string>
@@ -140,7 +141,7 @@
    <string name="Display">Display</string>
    <string name="Photo">Photo</string>
    <string name="title_activity_Additional_visibility">Additional Visibility</string>
-    <string name="title_activity_Non_Work">Non-Work Reason</string>
+    <string name="title_activity_Non_Work">Non Working Reason</string>
    <string name="closed">Close</string>

    <string name="click_image">Please click image</string>
@@ -148,6 +149,15 @@
    <string name="fill_gaps_data">Please fill GAP data</string>
    <string name="data_will_be_lost">Want to proceed usaved data will be deleted</string>

+    <string name="download_data">Downloading Data</string>
+    <string name="store_visited">Store Visited</string>
+    <string name="store_image">Click Store Front Image</string>
+
+    <string name="title_activity_store_image">Store Front Image</string>
+    <string name="reason">Reason</string>
+    <string name="select_reason">Select Reason</string>
+    <string name="daily_activity_menu">Daily Data Menu</string>
+
    <!--Gagan start new code 2-->
    <string name="stock_facing_planogram_dialog_title">Planogram</string>
    <!--Gagan end new code 2-->