Merge branch 'master' into JioAC

GSKMTOrange/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 24
     buildToolsVersion "24.0.1"
 
     useLibrary 'org.apache.http.legacy'
@@ -35,11 +35,11 @@ dependencies {
 
     compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.android.support:design:24.2.1'
-    compile 'com.google.android.gms:play-services-location:9.4.0'
+    compile 'com.google.android.gms:play-services-location:9.8.0'
-    compile 'com.google.android.gms:play-services-maps:9.4.0'
+    compile 'com.google.android.gms:play-services-maps:9.8.0'
     compile 'com.android.support:cardview-v7:24.2.1'
-    compile 'com.google.android.gms:play-services-appindexing:9.4.0'
+    compile 'com.google.android.gms:play-services-appindexing:9.8.0'
     compile 'com.android.support:support-v4:24.2.1'
-    testCompile 'junit:junit:4.12'
     compile 'com.google.code.gson:gson:2.7'
+    testCompile 'junit:junit:4.12'
 }

GSKMTOrange/src/main/AndroidManifest.xml

@@ -152,6 +152,10 @@
         <activity
             android:name=".dailyentry.CheckoutActivity"
             android:label="@string/title_activity_checkout"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".dailyentry.ServiceActivity"
+            android:label="@string/title_activity_service"
             android:theme="@style/AppTheme.NoActionBar"></activity>
     </application>
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -51,7 +51,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
  */
 
 public class GSKOrangeDB extends SQLiteOpenHelper {
-    public static final String DATABASE_NAME = "GSK_ORANGE";
+    public static final String DATABASE_NAME = "GSK_ORANGE_DB";
     public static final int DATABASE_VERSION = 13;
     TableBean tableBean;
     private SQLiteDatabase db;
@@ -130,6 +130,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
 
+        db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+        db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
+
     }
 
     public void deleteAllTables() {
@@ -191,7 +197,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         try {
 
-            dbcursor = db.rawQuery("Select  BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN  DISPLAY_MASTER DM  ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null);
+            dbcursor = db.rawQuery("Select  BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH from BRAND_MASTER BM INNER JOIN MAPPING_T2P T ON BM.BRAND_ID = T.BRAND_ID INNER JOIN  DISPLAY_MASTER DM  ON T.DISPLAY_ID= DM.DISPLAY_ID WHERE T.STORE_ID = '" + store_id + "'", null);
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {
@@ -210,6 +216,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     t2p.setDisplay(dbcursor.getString(dbcursor
                             .getColumnIndexOrThrow("DISPLAY")));
 
+                    t2p.setRef_image_url(dbcursor.getString(dbcursor
+                            .getColumnIndexOrThrow("IMAGE_URL")));
+
+                    t2p.setRef_image_path(dbcursor.getString(dbcursor
+                            .getColumnIndexOrThrow("IMAGE_PATH")));
+
                     t2p.setImage("");
 
                     t2p.setRemark("");
@@ -483,6 +495,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
                 values.put("DISPLAY", data.getDISPLAY().get(i));
                 values.put("IMAGE_URL", data.getIMAGE_URL().get(i));
+                values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i));
 
                 db.insert("DISPLAY_MASTER", null, values);
             }
@@ -2471,6 +2484,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 values.put(CommonString.KEY_BRAND_ID, data.get(i).getBrand_id());
                 values.put(CommonString.KEY_BRAND, data.get(i).getBrand());
                 values.put(CommonString.KEY_DISPLAY, data.get(i).getDisplay());
+                values.put(CommonString.KEY_IMAGE_URL, data.get(i).getRef_image_url());
+                values.put(CommonString.KEY_IMAGE_PATH, data.get(i).getRef_image_path());
                 values.put(CommonString.KEY_IMAGE, data.get(i).getImage());
                 values.put(CommonString.KEY_REMARK, data.get(i).getRemark());
                 values.put(CommonString.KEY_PRESENT, data.get(i).isPresent());
@@ -2512,6 +2527,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
+
     public boolean additionalVisibilitydata(String store_id, String category_id) {
         Log.d("AdditionalVisibility ", "AdditionalVisibility data--------------->Start<------------");
         ArrayList<AddittionalGetterSetter> list = new ArrayList<>();
@@ -2712,6 +2728,47 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             }
 
 
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    T2PGetterSetter tp = new T2PGetterSetter();
+
+                    tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID)));
+                    tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));
+                    tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
+                    tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND)));
+                    tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY)));
+                    tp.setRef_image_url(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_URL)));
+                    tp.setRef_image_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_PATH)));
+                    tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
+                    tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK)));
+                    tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
+                    tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
+
+                    list.add(tp);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            return list;
+        }
+        return list;
+    }
+
+    // get T2P Compliance store wise data
+    public ArrayList<T2PGetterSetter> getT2pComplianceStorewiseData(String store_id) {
+
+        ArrayList<T2PGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+        try {
+
+
+                dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
+                        CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
+
+
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -43,6 +43,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
+import cpm.com.gskmtorange.dailyentry.ServiceActivity;
 import cpm.com.gskmtorange.dailyentry.SettingsActivity;
 import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity;
 import cpm.com.gskmtorange.dailyentry.StoreListActivity;
@@ -223,16 +224,6 @@ public class MainActivity extends AppCompatActivity
 
                     }
 
-
-
-
-					/*
-                    intent = new Intent(getBaseContext(),
-							UploadOptionActivity.class);
-					startActivity(intent);
-
-					MainMenuActivity.this.finish();*/
-
                 }
 
             } else {
@@ -260,88 +251,28 @@ public class MainActivity extends AppCompatActivity
 
         } else if (id == R.id.nav_exit) {
 
-
-          /*  Intent startDownload = 	new Intent(this,AdditionalVisibility.class);
-            startActivity(startDownload);
-
-            overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
-*/
             finish();
-
+            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
-        } else if (id == R.id.nav_services) {
-
-            /*Intent startDownload = 	new Intent(this,T2PComplianceActivity.class);
-            startActivity(startDownload);
-*/
-            //overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
 
         } else if (id == R.id.nav_setting) {
 
             Intent startDownload = new Intent(this, SettingsActivity.class);
             startActivity(startDownload);
 
+            finish();
+
             overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
 
             //startActivity(new Intent(MainActivity.this, CategoryListActivity.class));
 
-        } /*else if (id == R.id.nav_export) {
+        } else if (id == R.id.nav_services) {
 
-            AlertDialog.Builder builder1 = new AlertDialog.Builder(MainActivity.this);
+            Intent startservice = new Intent(this, ServiceActivity.class);
-            builder1.setMessage("Are you sure you want to take the backup of your data")
+            startActivity(startservice);
-                    .setCancelable(false)
-                    .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-                        @SuppressWarnings("resource")
-                        public void onClick(DialogInterface dialog, int id) {
-                            try {
-                                *//*File file = new File(Environment
-                                        .getExternalStorageDirectory(),
-                                        "capital_backup");
-                                if (!file.isDirectory()) {
-                                    file.mkdir();
-                                }*//*
 
-                                File sd = Environment.getExternalStorageDirectory();
+            overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
-                                File data = Environment.getDataDirectory();
 
-                                if (sd.canWrite()) {
+        }
-                                    long date = System.currentTimeMillis();
-
-                                    SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yy");
-                                    String dateString = sdf.format(date);
-
-                                    String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME;
-                                    String backupDBPath = "GSKMT_ORANGE_Database_backup" + dateString.replace('/', '-');
-
-                                    String path = Environment.getExternalStorageDirectory().getPath();
-
-                                    File currentDB = new File(data, currentDBPath);
-                                    File backupDB = new File(path, backupDBPath);
-
-                                    //Snackbar.make(rec_store_data, "Database Exported Successfully", Snackbar.LENGTH_SHORT).show();
-                                    Toast.makeText(MainActivity.this, "Database Exported Successfully", Toast.LENGTH_SHORT).show();
-
-                                    if (currentDB.exists()) {
-                                        @SuppressWarnings("resource")
-                                        FileChannel src = new FileInputStream(currentDB).getChannel();
-                                        FileChannel dst = new FileOutputStream(backupDB).getChannel();
-                                        dst.transferFrom(src, 0, src.size());
-                                        src.close();
-                                        dst.close();
-                                    }
-                                }
-                            } catch (Exception e) {
-                                System.out.println(e.getMessage());
-                            }
-                        }
-                    })
-                    .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            dialog.cancel();
-                        }
-                    });
-            AlertDialog alert1 = builder1.create();
-            alert1.show();
-        }*/
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);

GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java

@@ -77,7 +77,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On
                     intent.putExtra(CommonString.KEY_LOGIN_DATA, login_data);
                     startActivity(intent);
                 } else {
-                    Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                    Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
                 }
             }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -50,6 +50,7 @@ public class CommonString {
     public static final String KEY_COVERAGE_REMARK = "REMARK";
     public static final String KEY_IMAGE = "IMAGE";
     public static final String KEY_IMAGE_URL = "IMAGE_URL";
+    public static final String KEY_IMAGE_PATH = "IMAGE_PATH";
     public static final String KEY_ID = "Id";
     public static final String KEY_MERCHANDISER_ID = "MERCHANDISER_ID";
 
@@ -493,6 +494,8 @@ public class CommonString {
             + KEY_BRAND_ID + " INTEGER,"
             + KEY_DISPLAY_ID + " INTEGER,"
             + KEY_BRAND + " VARCHAR,"
+            + KEY_IMAGE_URL + " VARCHAR,"
+            + KEY_IMAGE_PATH+ " VARCHAR,"
             + KEY_DISPLAY + " VARCHAR,"
             + KEY_IMAGE + " VARCHAR,"
             + KEY_REMARK + " VARCHAR,"

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java

@@ -257,7 +257,7 @@ public class NonWorkingReason extends AppCompatActivity implements
                 if (_pathforcheck != null && !_pathforcheck.equals("")) {
                     if (new File(str + _pathforcheck).exists()) {
 
-                        camera.setImageDrawable(getResources().getDrawable(R.drawable.cam_deactive));
+                        camera.setImageDrawable(getResources().getDrawable(R.mipmap.camera_green));
 
 
                         image1 = _pathforcheck;

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java

@@ -0,0 +1,111 @@
+package cpm.com.gskmtorange.dailyentry;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+
+import java.util.Locale;
+
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.fragment.ServiceActivityFragment;
+
+public class ServiceActivity extends AppCompatActivity {
+
+    private SharedPreferences preferences;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_service);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        //preference data
+        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+
+        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+      /*  ServiceActivityFragment fragment = new ServiceActivityFragment();
+        getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/
+
+        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        fab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+                        .setAction("Action", null).show();
+            }
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+        }
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+    }
+
+    private static boolean updateResources(Context context, String language) {
+        String lang;
+
+        if(language.equalsIgnoreCase("English")){
+            lang = "EN";
+        }
+        else if(language.equalsIgnoreCase("UAE")) {
+
+            lang = "AR";
+        } else {
+            lang = "TR";
+        }
+
+        Locale locale = new Locale(lang);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return true;
+    }
+
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java

@@ -1,20 +1,38 @@
 package cpm.com.gskmtorange.dailyentry;
 
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
 import android.view.View;
 
+import java.util.Locale;
+
+import cpm.com.gskmtorange.MainActivity;
 import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.fragment.SelectLanguageFragment;
 import cpm.com.gskmtorange.fragment.SettingsActivityFragment;
 
 public class SettingsActivity extends AppCompatActivity implements SelectLanguageFragment.OnFragmentInteractionListener {
 
-    boolean isSelected = false;
+    String selected_lang = "", culture_id, notice_url;
+
+    FloatingActionButton fab;
+
+    private SharedPreferences preferences;
+
+    private SharedPreferences.Editor editor = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -23,20 +41,38 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        SettingsActivityFragment fragment = new SettingsActivityFragment();
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        //preference data
+        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        editor = preferences.edit();
+
+        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+      /*  SettingsActivityFragment fragment = new SettingsActivityFragment();
+        getSupportFragmentManager().beginTransaction().add(R.id.fragment,fragment).commit();*/
+
+        fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
 
-                if(isSelected){
+                if (selected_lang.equals("")) {
-                    finish();
+
-                }
+                    Snackbar.make(view, getString(R.string.select_language), Snackbar.LENGTH_LONG)
-                else {
-                    Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
+                } else {
+
+                    updateResources(getApplicationContext(),selected_lang);
+
+                    editor.putString(CommonString.KEY_LANGUAGE, selected_lang);
+                    editor.putString(CommonString.KEY_CULTURE_ID, culture_id);
+                    editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url);
+                    editor.commit();
+
+                    Intent startDownload = new Intent(getApplicationContext(), MainActivity.class);
+                    startActivity(startDownload);
+                    finish();
                 }
 
 
@@ -45,7 +81,81 @@ public class SettingsActivity extends AppCompatActivity implements SelectLanguag
     }
 
     @Override
-    public void onFragmentInteraction(boolean isSelected) {
+    public void onFragmentInteraction(String selected_lang, String culture_id, String notice_url) {
-        this.isSelected = isSelected;
+
+        this.selected_lang = selected_lang;
+        this.culture_id = culture_id;
+        this.notice_url = notice_url;
+
+        if (!selected_lang.equals("")) {
+            fab.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+
+            Intent startDownload = new Intent(getApplicationContext(), MainActivity.class);
+            startActivity(startDownload);
+
+            finish();
+            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+        }
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        //super.onBackPressed();
+        Intent startDownload = new Intent(getApplicationContext(), MainActivity.class);
+        startActivity(startDownload);
+
+        finish();
+
+        overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+    }
+
+    private static boolean updateResources(Context context, String language) {
+        String lang;
+
+        if(language.equalsIgnoreCase("English")){
+            lang = "EN";
+        }
+        else if(language.equalsIgnoreCase("UAE")) {
+
+            lang = "AR";
+        } else {
+            lang = "TR";
+        }
+
+        Locale locale = new Locale(lang);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return true;
     }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java

@@ -135,6 +135,12 @@ public class StoreListActivity extends AppCompatActivity {
 
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle action bar item clicks here. The action bar will
@@ -522,17 +528,13 @@ public class StoreListActivity extends AppCompatActivity {
 
     public boolean setcheckedmenthod(String store_cd) {
 
-
+        boolean result_flag = false;
         for (int i = 0; i < coverage.size(); i++) {
             if (store_cd.equals(coverage.get(i).getStoreId())) {
                 if (coverage.get(i).getOutTime() != null) {
                     result_flag = true;
                     break;
                 }
-            } else {
-
-                result_flag = false;
-
             }
         }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java

@@ -102,7 +102,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
         //preference data
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
 
         store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
         visit_date = preferences.getString(CommonString.KEY_DATE, null);
@@ -174,7 +174,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
     protected void onResume() {
         super.onResume();
 
-        updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
+        updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
     }
 
 
@@ -218,7 +218,18 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 @Override
                 public void onClick(View v) {
 
-                    mItem.setPresent(((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes)));
+                    if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) {
+                        mItem.setPresent(true);
+                    } else {
+                        mItem.setPresent(false);
+                        mItem.getGapsChecklist().clear();
+                        mItem.getSkulist().clear();
+                        if (!mItem.getImage().equals("")) {
+                            new File(str + mItem.getImage()).delete();
+                            mItem.setImage("");
+                        }
+
+                    }
 
                     t2PAdapter.notifyDataSetChanged();
                 }
@@ -239,7 +250,14 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 }
             }
 
-            if(camera_allow.equals("1")){
+            holder.btn_ref_img.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+
+                }
+            });
+
+            if (camera_allow.equals("1")) {
 
                 holder.img_cam.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -253,28 +271,49 @@ public class T2PComplianceActivity extends AppCompatActivity {
                 });
 
                 if (mItem.getImage().equals("")) {
-                    holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+                    if (mItem.isPresent()) {
+                        holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
+                    } else {
+                        //if not present camera disabled
+                        holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
+                    }
+
                 } else {
                     holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
                 }
-            }
+            } else {
-            else {
                 holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
             }
 
 
-            holder.toggle_btn.setChecked(mItem.isPresent());
+            boolean is_enabled = mItem.isPresent();
+
+            holder.toggle_btn.setChecked(is_enabled);
+            holder.img_cam.setEnabled(is_enabled);
+            holder.btn_gaps.setEnabled(is_enabled);
+            holder.btn_sku.setEnabled(is_enabled);
+
 
             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.isPresent()){
+                    holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+                }
+                else {
+                    holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background));
+                }
             }
 
             if (mItem.getSkulist().size() > 0) {
                 holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green));
             } else {
-                holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+                if(mItem.isPresent()){
+                    holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+                }
+                else {
+                    holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background));
+                }
             }
 
         }
@@ -516,7 +555,24 @@ public class T2PComplianceActivity extends AppCompatActivity {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
-            finish();
+            android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(T2PComplianceActivity.this);
+            builder.setTitle("Parinaam");
+            builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+                    .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+
+                            finish();
+                            overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
+                        }
+                    })
+                    .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    });
+            android.app.AlertDialog alert = builder.create();
+            alert.show();
         }
 
         //noinspection SimplifiableIfStatement
@@ -618,19 +674,22 @@ public class T2PComplianceActivity extends AppCompatActivity {
 
         for (int i = 0; i < t2PGetterSetters.size(); i++) {
 
-            if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
+            if(t2PGetterSetters.get(i).isPresent()){
-                flag = false;
+                if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
-                error_msg = getResources().getString(R.string.click_image);
+                    flag = false;
-                break;
+                    error_msg = getResources().getString(R.string.click_image);
-            } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) {
+                    break;
-                flag = false;
+                } else if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) {
-                error_msg = getResources().getString(R.string.fill_gaps_data);
+                    flag = false;
-                break;
+                    error_msg = getResources().getString(R.string.fill_gaps_data);
-            } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
+                    break;
-                flag = false;
+                } else if (t2PGetterSetters.get(i).getSkulist().size() == 0) {
-                error_msg = getResources().getString(R.string.fill_sku_data);
+                    flag = false;
-                break;
+                    error_msg = getResources().getString(R.string.fill_sku_data);
+                    break;
+                }
             }
+
         }
 
         return flag;
@@ -647,6 +706,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
                     public void onClick(DialogInterface dialog, int id) {
 
                         finish();
+                        overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
                     }
                 })
                 .setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
@@ -896,15 +956,13 @@ public class T2PComplianceActivity extends AppCompatActivity {
 
     private static boolean updateResources(Context context, String language) {
 
-        String lang ;
+        String lang;
 
-        if(language.equalsIgnoreCase("English")){
+        if (language.equalsIgnoreCase("English")) {
             lang = "EN";
-        }
+        } else if (language.equalsIgnoreCase("UAE")) {
-        else if(language.equalsIgnoreCase("UAE")) {
             lang = "AR";
-        }
+        } else {
-        else {
             lang = "TR";
         }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java

@@ -249,7 +249,7 @@ public class DownloadActivity extends AppCompatActivity {
                         return "BRAND_MASTER";
                     }
 
-                    data.value = 30;
+                    data.value = 25;
                     data.name = "BRAND_MASTER "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -284,7 +284,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "SUB_CATEGORY_MASTER";
                     }
-                    data.value = 40;
+                    data.value = 30;
                     data.name = "SUB_CATEGORY_MASTER "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -319,7 +319,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "CATEGORY_MASTER";
                     }
-                    data.value = 50;
+                    data.value = 35;
                     data.name = "CATEGORY_MASTER "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -354,7 +354,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "DISPLAY_MASTER";
                     }
-                    data.value = 60;
+                    data.value = 40;
                     data.name = "DISPLAY_MASTER "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -389,7 +389,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "MAPPING_STOCK";
                     }
-                    data.value = 80;
+                    data.value = 45;
                     data.name = "MAPPING_STOCK "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -424,7 +424,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         //return "MAPPING_T2P";
                     }
-                    data.value = 100;
+                    data.value = 50;
                     data.name = "MAPPING_T2P "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -458,7 +458,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "DISPLAY_CHECKLIST_MASTER";
                     }
-                    data.value = 100;
+                    data.value = 55;
                     data.name = "DISPLAY_CHECKLIST_MASTER "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -492,7 +492,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         //return "MAPPING_DISPLAY_CHECKLIST";
                     }
-                    data.value = 100;
+                    data.value = 60;
                     data.name = "MAPPING_DISPLAY_CHECKLIST "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -527,7 +527,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         return "NON_WORKING_REASON";
                     }
-                    data.value = 100;
+                    data.value = 65;
                     data.name = "NON_WORKING_REASON "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -562,7 +562,7 @@ public class DownloadActivity extends AppCompatActivity {
                     /*} else {
                         //return "MAPPING_PROMOTION";
                     }*/
-                    data.value = 100;
+                    data.value = 70;
                     data.name = "MAPPING_PROMOTION "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -600,7 +600,7 @@ public class DownloadActivity extends AppCompatActivity {
                     /*} else {
                         //return "MAPPING_ADDITIONAL_PROMOTION";
                     }*/
-                    data.value = 100;
+                    data.value = 75;
                     data.name = "MAPPING_ADDITIONAL_PROMOTION "+getResources().getString(R.string.download_data);
                 }
                 publishProgress(data);
@@ -636,7 +636,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         //return "STORE_PERFORMANCE";
                     }
-                    data.value = 100;
+                    data.value = 80;
                     data.name = "STORE_PERFORMANCE Data Download";
                 }
                 publishProgress(data);
@@ -708,7 +708,7 @@ public class DownloadActivity extends AppCompatActivity {
                     } else {
                         //return "MAPPING_PLANOGRAM";
                     }
-                    data.value = 100;
+                    data.value = 85;
                     data.name = "MAPPING_PLANOGRAM Data Download";
                 }
                 publishProgress(data);
@@ -772,6 +772,61 @@ public class DownloadActivity extends AppCompatActivity {
 
                 //Gagan end code
 
+                //Display Master Image save into folder
+                if (displayMasterGetterSetter != null) {
+
+                for (int i = 0; i < displayMasterGetterSetter.getIMAGE_URL().size(); i++) {
+                        //publishing image download
+                        data.value = data.value + 1;
+                        if (data.value < 100) {
+                            publishProgress(data);
+                        }
+
+                        String image_name = displayMasterGetterSetter.getIMAGE_URL().get(i);
+                        String img_url = displayMasterGetterSetter.getIMAGE_PATH().get(i);
+
+                        if (!img_url.equalsIgnoreCase("") && !image_name.equalsIgnoreCase("")) {
+                            URL url = new URL(img_url + image_name);
+                            HttpURLConnection c = (HttpURLConnection) url.openConnection();
+                            c.setRequestMethod("GET");
+                            c.getResponseCode();
+                            c.connect();
+
+                            if (c.getResponseCode() == 200) {
+                                int length = c.getContentLength();
+
+                                String size = new DecimalFormat("##.##").format((double) length / 1024) + " KB";
+
+                                //String PATH = Environment.getExternalStorageDirectory() + "/Download/GT_GSK_Images/";
+                                String PATH = CommonString.FILE_PATH;
+                                File file = new File(PATH);
+                                if (!file.isDirectory()) {
+                                    file.mkdir();
+                                }
+
+                                //  Environment.getExternalStorageDirectory() + "/GT_GSK_Images/" + _pathforcheck1;
+                                if (!new File(PATH + image_name).exists() && !size.equalsIgnoreCase("0 KB")) {
+                                    File outputFile = new File(file, image_name);
+                                    FileOutputStream fos = new FileOutputStream(outputFile);
+                                    InputStream is1 = c.getInputStream();
+
+                                    int bytes = 0;
+                                    byte[] buffer = new byte[1024];
+                                    int len1 = 0;
+
+                                    while ((len1 = is1.read(buffer)) != -1) {
+                                        bytes = (bytes + len1);
+                                        // data.value = (int) ((double) (((double)
+                                        // bytes) / length) * 100);
+                                        fos.write(buffer, 0, len1);
+                                    }
+                                    fos.close();
+                                    is1.close();
+                                }
+                            }
+                        }
+                    }
+                }
 
                 db.open();
                 db.InsertJCP(jcpgettersetter);
@@ -839,7 +894,9 @@ public class DownloadActivity extends AppCompatActivity {
             super.onPostExecute(s);
 
             dialog.dismiss();
-            finish();
+
+            showAlert(getString(R.string.data_downloaded_successfully));
+
         }
 
     }
@@ -855,6 +912,7 @@ public class DownloadActivity extends AppCompatActivity {
                        /* Intent i = new Intent(activity, StorelistActivity.class);
                         activity.startActivity(i);
                         activity.finish();*/
+                        finish();
 
                     }
                 });

GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java

@@ -111,6 +111,17 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
             btn_lang_1.setText(language.get(0));
             btn_lang_2.setText(language.get(1));
 
+            String lang = preferences.getString(CommonString.KEY_LANGUAGE, "");
+
+            if(lang.equals(language.get(0))){
+                btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+                btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background));
+            }
+            else if(lang.equals(language.get(1))){
+                btn_lang_1.setBackgroundColor(getResources().getColor(R.color.grey_background));
+                btn_lang_2.setBackgroundColor(getResources().getColor(R.color.colorPrimary));
+            }
+
             btn_lang_1.setOnClickListener(this);
             btn_lang_2.setOnClickListener(this);
         }
@@ -118,10 +129,10 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
     }
 
     // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(boolean selected_flag) {
+    public void onButtonPressed(String selected_lang, String culture_id, String notice_url) {
         if (mListener != null) {
 
-            mListener.onFragmentInteraction(selected_flag);
+            mListener.onFragmentInteraction(selected_lang,culture_id,notice_url);
         }
     }
 
@@ -150,7 +161,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
             case R.id.btn_language_one:
 
                 //selected_flag = true;
-                onButtonPressed(true);
+                onButtonPressed(language.get(0),culture_id.get(0),login_data.getNOTICE_URL().get(0));
 
                 updateResources(getActivity(), language.get(0));
 
@@ -168,7 +179,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
 
                 //selected_flag = true;
 
-                onButtonPressed(true);
+                onButtonPressed(language.get(1),culture_id.get(1),login_data.getNOTICE_URL().get(1));
 
                 updateResources(getActivity(), language.get(1));
 
@@ -196,7 +207,7 @@ public class SelectLanguageFragment extends Fragment implements View.OnClickList
      */
     public interface OnFragmentInteractionListener {
         // TODO: Update argument type and name
-        void onFragmentInteraction(boolean flag);
+        void onFragmentInteraction(String lang, String culture_id, String notice);
     }
 
     private void getDataFromSharedPreferences(){

GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java

@@ -0,0 +1,203 @@
+package cpm.com.gskmtorange.fragment;
+
+import android.content.DialogInterface;
+import android.os.Environment;
+import android.support.v4.app.Fragment;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.channels.FileChannel;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+
+import cpm.com.gskmtorange.Database.GSKOrangeDB;
+import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.dailyentry.ServiceActivity;
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class ServiceActivityFragment extends Fragment {
+
+    public ServiceActivityFragment() {
+    }
+
+    ArrayList<ServiceGetterSetter> serviceList;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_service, container, false);
+
+        RecyclerView rec = (RecyclerView) view.findViewById(R.id.rec_settings);
+
+        ServiceGetterSetter service = new ServiceGetterSetter();
+        service.setName(getString(R.string.export_database));
+        service.setIcon(R.mipmap.entry_grey);
+        //SelectLanguageFragment selectLanguageFragment = new SelectLanguageFragment();
+        service.setFragment(null);
+
+        serviceList = new ArrayList<>();
+        serviceList.add(service);
+
+        rec.setLayoutManager(new LinearLayoutManager(getActivity()));
+        ServiceAdapter serviceAdapter = new ServiceAdapter();
+        rec.setAdapter(serviceAdapter);
+
+        return view;
+    }
+
+    class ServiceAdapter extends RecyclerView.Adapter<ServiceAdapter.ViewHolder>{
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.settings_item_layout, parent, false);
+            return new ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            final ServiceGetterSetter mItem = serviceList.get(position);
+            holder.tv_settings.setText(mItem.getName());
+
+            holder.cardView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Fragment nextFrag= mItem.getFragment();
+
+                    if(nextFrag != null){
+                        getActivity().getSupportFragmentManager().beginTransaction()
+                                .replace(R.id.fragment, nextFrag,"Settings")
+                                .addToBackStack(null)
+                                .commit();
+                    }
+                    else{
+                        showExportDialog();
+                    }
+
+
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return serviceList.size();
+        }
+
+        class ViewHolder extends RecyclerView.ViewHolder{
+
+            public CardView cardView;
+            public TextView tv_settings;
+
+            public ViewHolder(View itemView) {
+                super(itemView);
+                cardView = (CardView) itemView.findViewById(R.id.card_layout);
+                tv_settings = (TextView) itemView.findViewById(R.id.tv_settings);
+            }
+        }
+    }
+
+    class ServiceGetterSetter{
+
+        String name;
+        int icon;
+        Fragment fragment;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getIcon() {
+            return icon;
+        }
+
+        public void setIcon(int icon) {
+            this.icon = icon;
+        }
+
+
+        public Fragment getFragment() {
+            return fragment;
+        }
+
+        public void setFragment(Fragment fragment) {
+            this.fragment = fragment;
+        }
+    }
+
+    public void showExportDialog(){
+
+        AlertDialog.Builder builder1 = new AlertDialog.Builder(getActivity());
+        builder1.setMessage("Are you sure you want to take the backup of your data")
+                .setCancelable(false)
+                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                    @SuppressWarnings("resource")
+                    public void onClick(DialogInterface dialog, int id) {
+                        try {
+                            File file = new File(Environment
+                            .getExternalStorageDirectory(),
+                                    "gsk_orange_backup");
+                            if (!file.isDirectory()) {
+                                file.mkdir();
+                            }
+
+                            File sd = Environment.getExternalStorageDirectory();
+                            File data = Environment.getDataDirectory();
+
+                            if (sd.canWrite()) {
+                                long date = System.currentTimeMillis();
+
+                                SimpleDateFormat sdf = new SimpleDateFormat("MMM/dd/yy");
+                                String dateString = sdf.format(date);
+
+                                String currentDBPath = "//data//cpm.com.gskmtorange//databases//" + GSKOrangeDB.DATABASE_NAME;
+                                String backupDBPath = "GSKMT_ORANGE_Database_backup" + dateString.replace('/', '-');
+
+                                String path = Environment.getExternalStorageDirectory().getPath()+ "/gsk_orange_backup";
+
+                                File currentDB = new File(data, currentDBPath);
+                                File backupDB = new File(path, backupDBPath);
+
+                                //Snackbar.make(rec_store_data, "Database Exported Successfully", Snackbar.LENGTH_SHORT).show();
+                                Toast.makeText(getActivity(), getString(R.string.data_exported_successfully), Toast.LENGTH_SHORT).show();
+
+                                if (currentDB.exists()) {
+                                    @SuppressWarnings("resource")
+                                    FileChannel src = new FileInputStream(currentDB).getChannel();
+                                    FileChannel dst = new FileOutputStream(backupDB).getChannel();
+                                    dst.transferFrom(src, 0, src.size());
+                                    src.close();
+                                    dst.close();
+                                }
+                            }
+                        } catch (Exception e) {
+                            System.out.println(e.getMessage());
+                        }
+                    }
+                })
+                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        dialog.cancel();
+                    }
+                });
+        AlertDialog alert1 = builder1.create();
+        alert1.show();
+    }
+}

GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java

@@ -79,7 +79,7 @@ public class SettingsActivityFragment extends Fragment {
                 public void onClick(View v) {
                     Fragment nextFrag= mItem.getFragment();
                     getActivity().getSupportFragmentManager().beginTransaction()
-                            .replace(R.id.fragment, nextFrag,"Settings")
+                            .add(R.id.fragment, nextFrag,"Settings")
                             .addToBackStack(null)
                             .commit();
                 }

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

@@ -230,7 +230,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
                                         toggle_add_promoAnnouncer.setChecked(true);
                                         toggle_add_runningPos.setChecked(true);
 
-                                        Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show();
+                                        Snackbar.make(v, "promo is added", Snackbar.LENGTH_LONG).setAction("Action", null).show();
                                         //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show();
                                     }
                                 })

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

@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -14,6 +15,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
@@ -38,6 +40,8 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
@@ -67,6 +71,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
 
+import static android.R.attr.angle;
+
 public class Stock_FacingActivity extends AppCompatActivity {
     static int child_position = -1;
     ExpandableListView expandableListView;
@@ -265,7 +271,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         getCurrentFocus().clearFocus();
                     }
 
-                    fab.setVisibility(View.INVISIBLE);
+                    fab.setVisibility(View.VISIBLE);
                 }
             });
 
@@ -334,8 +340,9 @@ public class Stock_FacingActivity extends AppCompatActivity {
                     //Camera allow enable
                     if (camera_allow.equalsIgnoreCase("1")) {
 
-                        if (!imagePath.equals("") || !imagePath1.equals("")) {
+                        //if (!imagePath.equals("") || !imagePath1.equals("")) {
-                            if (!stock.equals("0")) {
+                        if (!stock.equals("0")) {
+                            if (!imagePath.equals("") || !imagePath1.equals("")) {
                                 if (stock.equals("") || faceup.equals("")) {
                                     if (!checkHeaderArray.contains(i)) {
                                         checkHeaderArray.add(i);
@@ -346,17 +353,26 @@ public class Stock_FacingActivity extends AppCompatActivity {
                                     break;
                                 }
                             } else {
-                                if (stock.equals("")) {
+                                if (!checkHeaderArray.contains(i)) {
-                                    if (!checkHeaderArray.contains(i)) {
+                                    checkHeaderArray.add(i);
-                                        checkHeaderArray.add(i);
-                                    }
-
-                                    flag = false;
-                                    Error_Message = getResources().getString(R.string.fill_data);
-                                    break;
                                 }
+
+                                flag = false;
+                                Error_Message = getResources().getString(R.string.click_image);
+                                break;
                             }
                         } else {
+                            if (stock.equals("")) {
+                                if (!checkHeaderArray.contains(i)) {
+                                    checkHeaderArray.add(i);
+                                }
+
+                                flag = false;
+                                Error_Message = getResources().getString(R.string.fill_data);
+                                break;
+                            }
+                        }
+                        /*} else {
                             if (!checkHeaderArray.contains(i)) {
                                 checkHeaderArray.add(i);
                             }
@@ -364,7 +380,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                             flag = false;
                             Error_Message = getResources().getString(R.string.click_image);
                             break;
-                        }
+                        }*/
 
                     } else {
                         //Camera allow disable
@@ -660,7 +676,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
             builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                     .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
-
                             finish();
                         }
                     })
@@ -683,24 +698,35 @@ public class Stock_FacingActivity extends AppCompatActivity {
             //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
             dialog.setContentView(R.layout.planogram_dialog_layout);
             dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
-
+            dialog.setCancelable(false);
-            ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
 
             ArrayList<MAPPING_PLANOGRAM_DataGetterSetter> mp = db.getMappingPlanogramData("");
 
+            //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+            WebView webView = (WebView) dialog.findViewById(R.id.webview);
+            webView.setWebViewClient(new MyWebViewClient());
+
+            webView.getSettings().setAllowFileAccess(true);
+            webView.getSettings().setJavaScriptEnabled(true);
+            webView.getSettings().setBuiltInZoomControls(true);
+
             String planogram_image = mp.get(0).getPLANOGRAM_IMAGE();
             if (new File(str + planogram_image).exists()) {
                 Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
-                img_planogram.setImageBitmap(bmp);
+                // img_planogram.setRotation(90);
-            } else {
+                //img_planogram.setImageBitmap(bmp);
-                img_planogram.setBackgroundResource(R.drawable.sad_cloud);
-            }
 
-            /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) {
+                String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
-                Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg");
+                String html = "<html><head></head><body><img src=\"" + imagePath + "\"></body></html>";
-                img_planogram.setImageBitmap(bmp);
+                webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
-            } else {
+
-                img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+                dialog.show();
+            } /*else {
+                //webView.loadUrl(String.valueOf(R.drawable.sad_cloud));
+
+                //img_planogram.setBackgroundResource(R.drawable.sad_cloud);
             }*/
 
 
@@ -708,17 +734,39 @@ public class Stock_FacingActivity extends AppCompatActivity {
             cancel.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                     dialog.dismiss();
                 }
             });
 
-            dialog.show();
+            //dialog.show();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private class MyWebViewClient extends WebViewClient {
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            view.loadUrl(url);
+            return true;
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            super.onPageFinished(view, url);
+            view.clearCache(true);
+        }
+
+        @Override
+        public void onPageStarted(WebView view, String url, Bitmap favicon) {
+            super.onPageStarted(view, url, favicon);
+        }
+    }
+
+
     @Override
     public void onBackPressed() {
         //super.onBackPressed();
@@ -728,14 +776,12 @@ public class Stock_FacingActivity extends AppCompatActivity {
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                 .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
-
                         finish();
                     }
                 })
                 .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-
                     }
                 });
         android.app.AlertDialog alert = builder.create();
@@ -951,7 +997,11 @@ public class Stock_FacingActivity extends AppCompatActivity {
             }
 
             if (childData.getStock().equals("0")) {
-                holder.ed_facing.setEnabled(false);
+                if (childData.getCompany_id().equals("1")) {
+                    holder.ed_facing.setEnabled(false);
+                } else {
+                    holder.ed_facing.setEnabled(true);
+                }
             } else {
                 holder.ed_facing.setEnabled(true);
             }
@@ -971,6 +1021,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         if (stock.equals("0")) {
                             childData.setFacing("0");
                             finalHolder.ed_facing.setText("0");
+
                             finalHolder.ed_facing.setEnabled(false);
                         } else {
                             childData.setFacing(childData.getFacing());

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/DisplayMasterGetterSetter.java

@@ -13,6 +13,7 @@ public class DisplayMasterGetterSetter {
     ArrayList<String> DISPLAY_ID = new ArrayList<>();
     ArrayList<String> DISPLAY = new ArrayList<>();
     ArrayList<String> IMAGE_URL = new ArrayList<>();
+    ArrayList<String> IMAGE_PATH = new ArrayList<>();
 
     public String getTable_DISPLAY_MASTER() {
         return table_DISPLAY_MASTER;
@@ -45,4 +46,12 @@ public class DisplayMasterGetterSetter {
     public void setIMAGE_URL(String IMAGE_URL) {
         this.IMAGE_URL.add(IMAGE_URL);
     }
+
+    public ArrayList<String> getIMAGE_PATH() {
+        return IMAGE_PATH;
+    }
+
+    public void setIMAGE_PATH(String IMAGE_PATH) {
+        this.IMAGE_PATH.add(IMAGE_PATH);
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 
 public class T2PGetterSetter {
 
-    String brand_id, display_id, brand, display, image, remark, key_id, category_id;
+    String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path;
     boolean isPresent;
 
     ArrayList<GapsChecklistGetterSetter> gapsChecklist = new ArrayList<>();
@@ -101,4 +101,20 @@ public class T2PGetterSetter {
     public void setCategory_id(String category_id) {
         this.category_id = category_id;
     }
+
+    public String getRef_image_url() {
+        return ref_image_url;
+    }
+
+    public void setRef_image_url(String ref_image_url) {
+        this.ref_image_url = ref_image_url;
+    }
+
+    public String getRef_image_path() {
+        return ref_image_path;
+    }
+
+    public void setRef_image_path(String ref_image_path) {
+        this.ref_image_path = ref_image_path;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java

@@ -363,6 +363,10 @@ public class XMLHandlers {
                     if (xpp.getName().equals("IMAGE_URL")) {
                         display.setIMAGE_URL(xpp.nextText());
                     }
+                    if (xpp.getName().equals("IMAGE_PATH")) {
+                        display.setIMAGE_PATH(xpp.nextText());
+                    }
+
                 }
                 xpp.next();
             }

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="cpm.com.gskmtorange.dailyentry.ServiceActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_service" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_dialog_email" />
+
+</android.support.design.widget.CoordinatorLayout>

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

@@ -25,10 +25,11 @@
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
+        android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+        app:srcCompat="@mipmap/tick" />
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -76,7 +76,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="1"
-                            android:background="#70888888"
+                            android:background="@color/colorPrimaryDark"
                             android:orientation="vertical">
 
                             <TextView

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

@@ -0,0 +1,9 @@
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment"
+    android:name="cpm.com.gskmtorange.fragment.ServiceActivityFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:layout="@layout/fragment_service" />

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

@@ -16,6 +16,7 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:background="@color/grey_background"
        >
 
         <android.support.v7.widget.CardView
@@ -26,7 +27,8 @@
             android:layout_marginRight="5dp"
             android:layout_marginTop="20dp"
             card_view:cardBackgroundColor="@color/white"
-            card_view:cardCornerRadius="5dp">
+            card_view:cardCornerRadius="5dp"
+            app:cardElevation="2dp">
 
             <LinearLayout
                 android:id="@+id/ans_layout"

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content_service"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/custom_margin"
+    android:paddingLeft="@dimen/custom_margin"
+    android:paddingRight="@dimen/custom_margin"
+    android:paddingTop="@dimen/custom_margin"
+    tools:context="cpm.com.gskmtorange.fragment.ServiceActivityFragment"
+    tools:showIn="@layout/activity_service">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rec_settings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>

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

@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:background="@null"
-            android:src="@drawable/cam_active" />
+            android:src="@mipmap/camera_orange" />
     </RelativeLayout>
 
     <RelativeLayout

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

@@ -36,12 +36,18 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <ImageView
+<!--                <ImageView
                     android:id="@+id/img_planogram"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_margin="10dp"
-                    android:src="@drawable/sad_cloud"/>
+                    android:src="@drawable/sad_cloud" />-->
+
+                <WebView
+                    android:id="@+id/webview"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+
             </LinearLayout>
         </LinearLayout>
 

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

@@ -0,0 +1,63 @@
+<?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="wrap_content"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    >
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/card_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/custom_margin"
+        android:layout_marginRight="@dimen/custom_margin"
+        android:layout_marginTop="@dimen/custom_margin"
+        card_view:cardBackgroundColor="@color/white"
+        card_view:cardCornerRadius="10dp"
+        >
+
+        <LinearLayout
+            android:id="@+id/parent_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_weight="3"
+            >
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="5dp"
+                >
+
+                <ImageView
+                    android:id="@+id/btn_is_present"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textOn="@string/yes"
+                    android:textOff="@string/no"
+                    android:background="@mipmap/exit_grey"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/tv_settings"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:text="Checklist"
+                android:textColor="@color/black"
+                android:textStyle="bold"
+                android:gravity="center_vertical"
+                android:paddingLeft="@dimen/custom_margin"/>
+
+
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>

GSKMTOrange/src/main/res/menu/menu_.xml

@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="cpm.com.gskmtorange.dailyentry.ServiceActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
+</menu>

GSKMTOrange/src/main/res/menu/planogram.xml

@@ -5,6 +5,6 @@
         android:id="@+id/action_planogram"
         android:icon="@mipmap/ref_images_white"
         android:orderInCategory="100"
-        android:title="planogram"
+        android:title="@string/stock_facing_planogram_dialog_title"
         app:showAsAction="always" />
 </menu>

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

@@ -73,20 +73,22 @@
     <string name="daily_data_menu_additional_promotions">Promosyon</string>
 
     <string name="msl_availability_sku">Ürün Adı</string>
-    <string name="msl_availability_mbq">MBQ</string>
+    <string name="msl_availability_mbq">X</string>
     <string name="msl_availability_availability">Bulunurluk</string>
 
     <string name="stock_facing_reference_image">Örnek Fotoğraf</string>
     <string name="stock_facing_sku_name">Ürün Adı</string>
-    <string name="stock_facing_stock">Stock</string>
+    <string name="stock_facing_stock">Stock</string>            <!--change string-->
     <string name="stock_facing_faceup">Önyüz</string>
     <string name="stock_facing_sos_target">Raf Payı Hedefi</string>
     <string name="stock_facing_sos">Raf Payi</string>
+    <!--Gagan end code-->
 
+    <!--Gagan start new code 1-->
     <string name="title_activity_promo_compliance">Promosyon</string>
 
-    <string name="promo_compliance_additional_promo">Additional Promos</string>
+    <string name="promo_compliance_additional_promo">Ek Promosyon</string>
-    <string name="promo_compliance_promo">Promos</string>
+    <string name="promo_compliance_promo">Promosyon</string>
     <string name="promo_compliance_promos_sku">Promosyon Ürünü</string>
     <string name="promo_compliance_sku">Promosyon Ürünü</string>
     <string name="promo_compliance_inStock">Ürün Bulunuyor</string>
@@ -106,11 +108,7 @@
     <string name="category_performance_lsv">Son Ziyaret</string>
 
     <string name="title_activity_store_wise_performance">Mağaza Performansı</string>
-    <!--Gagan End Code -->
+    <!--Gagan end new code 1-->
-
-    <!--Gagan start new code 2-->
-    <string name="stock_facing_planogram_dialog_title">Planogram</string>
-    <!--Gagan end new code 2-->
 
     <string name="stock">Stock</string>
     <string name="AdditionalDisplay">Ek Teşhir</string>
@@ -128,6 +126,31 @@
     <string name="title_activity_Want_to_delete1"> Verileri silmek istiyor musun</string>
     <string name="title_activity_click_delete">Silme için Evet tıklayın</string>
     <string name="title_activity_select_dropdown">Please Select dropdown</string>
+    <string name="title_activity_take_image">Please Take a image</string>
+
+    <string name="title_activity_fill_sku">Please fill sku data</string>
+    <string name="title_activity_enter_quantity">Please enter Quantity</string>
+    <string name="title_activity_save_data">Do you want to save the data</string>
+
+
+    <string name="clickimage">Please click the image</string>
+    <string name="gps">GPS IS DISABLED...</string>
+    <string name="gpsebale">Click ok to enable GPS.</string>
+    <string name="takeimage"> Please Take Image Before Save</string>
+    <string name="notsuppoted">This device is not supported.</string>
+    <string name="uploaddata">Uploading Data</string>
+    <string name="geotagdata">Uploading Geotag Data...</string>
+    <string name="failure">failure</string>
+    <string name="uploadimge">Uploading Geotag Images</string>
+    <string name="success">success</string>
+    <string name="wantcheckout">Are you sure you want to Checkout</string>
+    <string name="nonetwork"> No Network</string>
+
+    <string name="click_image">Please click image</string>
+
+    <string name="export_database">Veritabanı Aktar</string>
+    <string name="title_activity_service">Servisler</string>
+
     <string name="title_activity_take_image">En az bir fotoğraf çekiniz</string>
 
     <string name="title_activity_fill_sku">Ürün ekle</string>
@@ -163,6 +186,7 @@
     <string name="delete">Sil</string>
     <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
     <string name="displayname">Teşhir Türü</string>
+
     <string name="storefront">Click Store Front Image</string>
     <string name="brandname">Brand Name</string>
     <string name="skuname">SKU Name</string>
@@ -172,6 +196,20 @@
     <string name="Remark">Remark</string>
     <string name="pleaseenterRemarks">Please fill Remark</string>
 
+
+    <!--Gagan start new code 2-->
+    <string name="stock_facing_planogram_dialog_title">Örnek Fotoğraf</string>
+    <string name="title_activity_settings">Ayarlar</string>
+
+    <string name="ok">Tamam</string>
+    <string name="check_save_message">Veriyi saklamak istiyor musunuz?</string>
+    <string name="save_message">Veriler Kaydedildi</string>
+    <string name="update_message">Veriler Kaydedildi</string>
+    <string name="empty_field">Tüm alanlari doldurunuz </string>
+    <string name="fill_data">Tüm alanlari doldurunuz</string>
+    <string name="dialog_title">Parinaam</string>
+    <!--Gagan end new code 2-->
+
 </resources>
 
 

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

@@ -7,7 +7,7 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 
-    <dimen name="custom_margin">10dp</dimen>
+    <dimen name="custom_margin">5dp</dimen>
 
     <dimen name="text_size_normal">20sp</dimen>
     <dimen name="text_size_small">16sp</dimen>

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

@@ -68,7 +68,6 @@
     <string name="title_activity_t2_pcompliance">T2P Compliance</string>
 
     <!--Gagan start code-->
-
     <string name="title_activity_category_list">Category List</string>
     <string name="title_activity_category_wise_performance">Categorywise Performance</string>
     <string name="title_activity_daily_main_menu">Daily Data Menu</string>
@@ -93,7 +92,6 @@
     <string name="stock_facing_faceup">Facing</string>
     <string name="stock_facing_sos_target">SOS Target</string>
     <string name="stock_facing_sos">SOS</string>
-
     <!--Gagan end code-->
 
     <string name="title_geo_tag_activity_upload_data">Store Uploaded</string>
@@ -195,8 +193,8 @@
     <string name="daily_activity_menu">Daily Data Menu</string>
 
     <!--Gagan start new code 2-->
-    <string name="stock_facing_planogram_dialog_title">Planogram</string>
+    <string name="stock_facing_planogram_dialog_title">Reference Image</string>
-    <string name="title_activity_settings">SettingsActivity</string>
+    <string name="title_activity_settings">Settings</string>
 
     <string name="ok">OK</string>
     <string name="check_save_message">Are you sure you want to save</string>
@@ -205,7 +203,6 @@
     <string name="empty_field">Fill the value </string>
     <string name="fill_data">Please fill all the data</string>
     <string name="dialog_title">Parinaam</string>
-
     <!--Gagan end new code 2-->
 
     <string name="select_language_item">Select language</string>
@@ -214,6 +211,7 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="title_activity_checkout">CheckoutActivity</string>
     <string name="checkout_successful">Checkout Success</string>
+
     <string name="NetworkError">Network Error ,</string>
     <string name="DataNot"> Data Not Uploaded ,</string>
     <string name="displayname">Display Name</string>
@@ -221,5 +219,10 @@
     <string name="Remark">Remark</string>
     <string name="pleaseenterRemarks">Please fill Remark</string>
 
+    <string name="title_activity_service">Service</string>
+  
+    <string name="data_downloaded_successfully">Data downloaded successfully</string>
+    <string name="export_database">Export Database</string>
+    <string name="data_exported_successfully">Database Exported Successfully</string>
 
 </resources>