AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into NewCODE

Browse Source
This commit is contained in:
ashishandroid
2017-01-23 17:38:20 +05:30
parent 7df66f1d5f ecfb8e5406
commit f325d1d385
19 changed files with 111 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/AndroidManifest.xml
+3 -2
View File
@@ -14,7 +14,7 @@
<application
android:allowBackup="true"
android:icon="@drawable/gsklogo"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
@@ -48,7 +48,8 @@
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".download.DownloadActivity"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".GeoTag.GeoTagStoreList"
android:label="@string/title_activity_store_list"
GSKMTOrange/src/main/ic_launcher-web.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java
+3 -3
View File
@@ -27,8 +27,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.MainActivity;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
@@ -52,6 +50,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
LinearLayout parent_linear,nodata_linear;
LinearLayout linearlay;
FloatingActionButton fab;
Toolbar toolbar;
protected void onCreate(Bundle savedInstanceState) {
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
@@ -64,7 +63,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
//parent_linear = (LinearLayout) findViewById(R.id.parent_linear);
fab = (FloatingActionButton) findViewById(R.id.fab);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
@@ -284,6 +283,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi
protected void onResume() {
super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_store_geotag));
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+5 -3
View File
@@ -108,6 +108,8 @@ public class LoginActivity extends AppCompatActivity {
int eventType;
Button museridSignInButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -135,9 +137,9 @@ public class LoginActivity extends AppCompatActivity {
//populateAutoComplete();
mPasswordView = (EditText) findViewById(R.id.password);
museridView.setText("testmer");
/* museridView.setText("testmer");
mPasswordView.setText("cpm123");
*/
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
@@ -159,7 +161,7 @@ public class LoginActivity extends AppCompatActivity {
}
Button museridSignInButton = (Button) findViewById(R.id.user_login_button);
museridSignInButton = (Button) findViewById(R.id.user_login_button);
museridSignInButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+6 -12
View File
@@ -11,7 +11,6 @@ import android.graphics.Bitmap;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar;
@@ -28,13 +27,7 @@ import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
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 java.util.Locale;
@@ -43,13 +36,10 @@ import cpm.com.gskmtorange.GeoTag.GeoTagStoreList;
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;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
import cpm.com.gskmtorange.upload.PreviousDataUploadActivity;
import cpm.com.gskmtorange.upload.UploadActivity;
@@ -69,11 +59,13 @@ public class MainActivity extends AppCompatActivity
String error_msg;
Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -136,8 +128,10 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onResume() {
super.onResume();
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.main_menu_activity_name));
}
@Override
GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java
+1
View File
@@ -272,6 +272,7 @@ public class AutoUpdateActivity extends AppCompatActivity {
/* Intent i = new Intent(activity, StorelistActivity.class);
activity.startActivity(i);
activity.finish();*/
finish();
}
});
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+41 -53
View File
@@ -6,13 +6,10 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
@@ -27,16 +24,12 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.Collections;
@@ -44,14 +37,11 @@ import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GeoTag.GeoTagActivity;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
/**
@@ -74,21 +64,24 @@ public class StoreListActivity extends AppCompatActivity {
boolean result_flag = false, leaveflag = false;
FloatingActionButton fab;
String storeid;
Toolbar toolbar;
String language;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.storelistfablayout);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
date = preferences.getString(CommonString.KEY_DATE, null);
visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, "");
language = preferences.getString(CommonString.KEY_LANGUAGE, "");
db = new GSKOrangeDB(StoreListActivity.this);
db.open();
@@ -115,7 +108,8 @@ public class StoreListActivity extends AppCompatActivity {
// TODO Auto-generated method stub
super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(getString(R.string.title_activity_store_list));
storelist = db.getStoreData(date);
coverage = db.getCoverageData(date);
@@ -139,6 +133,7 @@ public class StoreListActivity extends AppCompatActivity {
@Override
public void onBackPressed() {
super.onBackPressed();
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
@@ -192,8 +187,14 @@ public class StoreListActivity extends AppCompatActivity {
final StoreBean current = data.get(position);
if (language.equalsIgnoreCase("TURKISH")) {
viewHolder.chkbtn.setBackgroundResource(R.mipmap.checkout_turkish);
} else {
viewHolder.chkbtn.setBackgroundResource(R.mipmap.checkout);
}
storeid = current.getSTORE_ID();
storeid = current.getSTORE_ID();
//viewHolder.txt.setText(current.txt);
viewHolder.txt.setText(current.getSTORE_NAME());
@@ -227,15 +228,11 @@ public class StoreListActivity extends AppCompatActivity {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
}
else if (checkleavestatus(storeid))
{
} else if (checkleavestatus(storeid)) {
viewHolder.imageview.setVisibility(View.VISIBLE);
viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation);
viewHolder.chkbtn.setVisibility(View.INVISIBLE);
}
else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
} else if (current.getCHECKOUT_STATUS().equalsIgnoreCase(CommonString.KEY_INVALID)) {
if (coverage.size() > 0) {
@@ -291,19 +288,14 @@ public class StoreListActivity extends AppCompatActivity {
Snackbar.make(v, R.string.title_store_list_activity_store_again_uploaded, Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_L)) {
Snackbar.make(v, R.string.title_store_list_activity_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
else if (checkleavestatus(store_id)) {
} else if (checkleavestatus(store_id)) {
Snackbar.make(v, R.string.title_store_list_activity_already_store_closed, Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
else {
} else {
// PUT IN PREFERENCES
editor = preferences.edit();
@@ -371,7 +363,7 @@ public class StoreListActivity extends AppCompatActivity {
Intent i = new Intent(StoreListActivity.this, CheckoutActivity.class);
i.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID() );
i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
startActivity(i);
} else {
@@ -397,6 +389,7 @@ public class StoreListActivity extends AppCompatActivity {
});
}
public boolean CheckNetAvailability() {
boolean connected = false;
@@ -410,6 +403,7 @@ public class StoreListActivity extends AppCompatActivity {
}
return connected;
}
@Override
public int getItemCount() {
return data.size();
@@ -548,15 +542,13 @@ public class StoreListActivity 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";
}
@@ -571,7 +563,7 @@ public class StoreListActivity extends AppCompatActivity {
resources.updateConfiguration(configuration, resources.getDisplayMetrics());
return true;
}
}
public void UpdateStore(String storeid) {
@@ -585,30 +577,26 @@ public class StoreListActivity extends AppCompatActivity {
public boolean checkleavestatus(String store_cd) {
if(coverage.size()>0)
{
if (coverage.size() > 0) {
for (int i = 0; i < coverage.size(); i++) {
if (store_cd.equals(coverage.get(i).getStoreId())) {
if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
result_flag = true;
break;
for (int i = 0; i < coverage.size(); i++) {
if (store_cd.equals(coverage.get(i).getStoreId())) {
if (coverage.get(i).getStatus().equalsIgnoreCase(CommonString.STORE_STATUS_LEAVE)) {
result_flag = true;
break;
}
} else {
result_flag = false;
}
} else {
result_flag = false;
}
}
}
return result_flag;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+5 -16
View File
@@ -13,11 +13,8 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -25,7 +22,6 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -49,9 +45,6 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.ToggleButton;
import com.google.android.gms.appindexing.AppIndex;
import com.google.android.gms.common.api.GoogleApiClient;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -60,15 +53,10 @@ import java.util.List;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.LoginActivity;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.fonts.FontManager;
import cpm.com.gskmtorange.fonts.TextDrawable;
import cpm.com.gskmtorange.gsk_dailyentry.Stock_FacingActivity;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
@@ -573,17 +561,18 @@ public class T2PComplianceActivity extends AppCompatActivity {
int id = item.getItemId();
if (id == android.R.id.home) {
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() {
.setPositiveButton(getString(R.string.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() {
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -720,14 +709,14 @@ public class T2PComplianceActivity extends AppCompatActivity {
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() {
.setPositiveButton(getString(R.string.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() {
.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+9
View File
@@ -1,5 +1,6 @@
package cpm.com.gskmtorange.download;
import android.app.ActionBar;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
@@ -9,10 +10,12 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Window;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -87,12 +90,16 @@ public class DownloadActivity extends AppCompatActivity {
private ProgressBar pb;
private TextView percentage, message;
private SharedPreferences preferences = null;
Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_download);
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
db = new GSKOrangeDB(this);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -973,6 +980,8 @@ public class DownloadActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
toolbar.setTitle(getString(R.string.main_menu_activity_name));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+1 -2
View File
@@ -863,7 +863,6 @@ public class Stock_FacingActivity extends AppCompatActivity {
txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD);
txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand());
if (headerTitle.getCompany_id().equals("1")) {
txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
@@ -872,7 +871,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
} else if (headerTitle.getSos_target().equals("-")) {
headerTitle.setSos_target("-");
}
txt_sosHeader.setText(headerTitle.getSos_target().toString());
txt_sosHeader.setText(getResources().getString(R.string.stock_facing_sos) + ": \n" + headerTitle.getSos_target().toString());
txt_sosHeader.setVisibility(View.VISIBLE);
img_camera1.setVisibility(View.VISIBLE);
GSKMTOrange/src/main/res/layout/activity_download.xml
+33 -8
View File
@@ -1,13 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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:id="@+id/activity_download"
android:id="@+id/coordinate"
android:layout_width="match_parent"
android:layout_height="match_parent"
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.download.DownloadActivity">
android:fitsSystemWindows="true"
tools:context="cpm.com.gskmtorange.MainActivity">
</RelativeLayout>
<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>
<RelativeLayout
android:id="@+id/activity_download"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="cpm.com.gskmtorange.download.DownloadActivity">
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/mipmap-hdpi/checkout_turkish.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/oralcare_tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

GSKMTOrange/src/main/res/mipmap-mdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

GSKMTOrange/src/main/res/mipmap-xhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_launcher.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 19 KiB

GSKMTOrange/src/main/res/values/strings.xml
+4 -4
View File
@@ -62,7 +62,7 @@
<string name="menu_export">Data Export</string>
<string name="menu_exit">Exit</string>
<string name="menu_setting">Setting</string>
<string name="menu_setting">Settings</string>
<string name="menu_services">Services</string>
<string name="title_activity_t2_pcompliance">T2P Compliance</string>
@@ -148,9 +148,9 @@
<string name="Photo">Photo</string>
<string name="title_activity_Additional_visibility">Additional Visibility</string>
<string name="title_activity_Want_save"> Are you sure You Want To Save</string>
<string name="title_activity_Want_save"> Are you sure you want to save</string>
<string name="title_activity_Want_add"> Please Add Data</string>
<string name="title_activity_Want_to_add">Are you sure You Want To Add</string>
<string name="title_activity_Want_to_add">Are you sure you want to add</string>
<string name="title_activity_Want_to_delete"> Do You Want To Delete Data</string>
<string name="store"> store</string>
<string name="title_activity_Want_to_delete1"> Do You Want To Delete</string>
@@ -173,7 +173,7 @@
<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 Connection. Please check your Internet Connection</string>
<string name="nonetwork"> No Network Connection. Please Check Your Internet Connection</string>
<string name="title_activity_Non_Work">Non Working Reason</string>
<string name="closed">Close</string>