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/GSKORANGEV2 into NEWBranchData

Browse Source
This commit is contained in:
ashishandroid
2017-02-24 15:13:02 +05:30
parent f856f4f320 50494bfb10
commit 1aeb417fc2
23 changed files with 368 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+24 -4
View File
@@ -27,6 +27,7 @@ import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
@@ -60,7 +61,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/
public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE_DB";
public static final String DATABASE_NAME = "GSK_ORANGE_DB1";
public static final int DATABASE_VERSION = 13;
TableBean tableBean;
private SQLiteDatabase db;
@@ -147,6 +148,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
db.execSQL(TableBean.getMappingSubCategoryImageAllow());
} catch (SQLException e) {
e.printStackTrace();
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
@@ -4164,10 +4167,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" +
" INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" +
" INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" +
" INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" +
" INNER JOIN MAPPING_SUB_CATEGORY_IMAGE_ALLOW MIA ON SB.SUB_CATEGORY_ID=MIA.SUB_CATEGORY_ID "+
" WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null);
@@ -4179,6 +4183,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
CPGS.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
CPGS.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
CPGS.setImage_allow(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_ALLOW")));
CPGS.setSubCategoryCamera1("");
CPGS.setSubCategoryCamera2("");
@@ -4676,8 +4681,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public boolean isPlanogramAddShelfSaveData(String store_id, String category_id) {
boolean filled = false;
Cursor dbcursor = null;
@@ -4704,4 +4707,21 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return filled;
}
public void InsertMappingSubCategoryImageAllow(MappingSubCategoryImageAllowGetterSetter data) {
db.delete("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
values.put("COUNTRY_ID", data.getCOUNTRY_ID().get(i));
values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
values.put("IMAGE_ALLOW", data.getIMAGE_ALLOW().get(i));
db.insert("MAPPING_SUB_CATEGORY_IMAGE_ALLOW", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + ex.toString());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/CategoryPictureGetterSetter.java
+8 -5
View File
@@ -11,6 +11,8 @@ public class CategoryPictureGetterSetter {
String CategoryImage3="";
String CategoryImage4="";
String image_allow = "0";
public String getCategoryId() {
return categoryId;
}
@@ -161,10 +163,11 @@ public class CategoryPictureGetterSetter {
}
public String getImage_allow() {
return image_allow;
}
public void setImage_allow(String image_allow) {
this.image_allow = image_allow;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+23 -20
View File
@@ -741,18 +741,30 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
}
public String getCurrentTime() {
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
@Override
@@ -957,15 +969,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
protected void startCameraActivity() {
try {
/*Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
Uri outputFileUri = Uri.fromFile(file);
Intent intent = new Intent(
MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
startActivityForResult(intent, 0);*/
Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
@@ -976,23 +979,23 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
/* Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
Log.e("TAG", "package name : " + list.get(n).packageName);
*/
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
@@ -1636,7 +1639,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
private static boolean updateResources(Context context, String language) {
String lang;
@@ -1651,7 +1654,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{
} else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java
+50 -44
View File
@@ -91,6 +91,8 @@ public class CategoryPicture extends AppCompatActivity {
im4 = (ImageView) findViewById(R.id.image4);
listview = (ListView) findViewById(R.id.listview);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
adddata = db.getCategoryPictureData(store_id, categoryId);
@@ -107,43 +109,35 @@ public class CategoryPicture extends AppCompatActivity {
String image3 = adddata.get(k).getCategoryImage3();
String image4 = adddata.get(k).getCategoryImage4();
if(image1 !=null)
{
if (image1 != null) {
im1.setBackgroundResource(R.mipmap.camera_green);
img_str1=image1;
img_str1 = image1;
}else
{
im1.setBackgroundResource(R.mipmap.camera_orange);
} else {
im1.setBackgroundResource(R.drawable.camera_orange_star_green);
}
if(image2 !=null)
{
if (image2 != null) {
im2.setBackgroundResource(R.mipmap.camera_green);
img_str2=image2;
img_str2 = image2;
}else
{
} else {
im2.setBackgroundResource(R.mipmap.camera_orange);
}
if(image3 !=null)
{
if (image3 != null) {
im3.setBackgroundResource(R.mipmap.camera_green);
img_str3=image3;
}else
{
img_str3 = image3;
} else {
im3.setBackgroundResource(R.mipmap.camera_orange);
}
if(image4 !=null)
{
if (image4 != null) {
im4.setBackgroundResource(R.mipmap.camera_green);
img_str4=image4;
}else
{
img_str4 = image4;
} else {
im4.setBackgroundResource(R.mipmap.camera_orange);
}
@@ -161,8 +155,6 @@ public class CategoryPicture extends AppCompatActivity {
adapteradditional = new CategoryPicture.CategoryAdapter(CategoryPicture.this, listdat);
listview.setAdapter(adapteradditional);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -177,14 +169,12 @@ public class CategoryPicture extends AppCompatActivity {
CP.setCamera_allow(camera_allow);
if (validateData(CP, listdat)) {
db.InsertCategoryPictureData(CP, listdat, categoryId);
finish();
} else {
Snackbar.make(view, "Please take image", Snackbar.LENGTH_LONG).setAction("Action", null).show();
@@ -251,24 +241,34 @@ public class CategoryPicture extends AppCompatActivity {
});
}
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
private static boolean updateResources(Context context, String language) {
String lang;
@@ -283,7 +283,7 @@ public class CategoryPicture extends AppCompatActivity {
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{
} else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
}
@@ -312,20 +312,23 @@ public class CategoryPicture extends AppCompatActivity {
List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
Log.e("TAG", "package name : " + list.get(n).packageName);
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
@@ -482,7 +485,6 @@ public class CategoryPicture extends AppCompatActivity {
holder.brand = (TextView) convertView.findViewById(R.id.textviewname);
holder.camera1 = (Button) convertView.findViewById(R.id.button3);
holder.camera2 = (Button) convertView.findViewById(R.id.cameranew);
convertView.setTag(holder);
@@ -532,6 +534,8 @@ public class CategoryPicture extends AppCompatActivity {
holder.camera1.setBackgroundResource(R.mipmap.camera_green);
} else if (listdat.get(position1).getImage_allow().equals("1")) {
holder.camera1.setBackgroundResource(R.drawable.camera_orange_star_green);
} else {
holder.camera1.setBackgroundResource(R.mipmap.camera_orange);
}
@@ -561,26 +565,28 @@ public class CategoryPicture extends AppCompatActivity {
if (cameraImage1 == null) {
flag = false;
}
for (int i = 0; i < list.size(); i++) {
if (flag) {
for (int i = 0; i < list.size(); i++) {
String imageu = list.get(i).getSubCategoryCamera1();
if (list.get(i).getImage_allow().equals("1")) {
if (imageu.equalsIgnoreCase("")) {
String imageu = list.get(i).getSubCategoryCamera1();
if (imageu.equalsIgnoreCase("")) {
flag = false;
break;
}
}
flag = false;
}
}
return flag;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+22 -19
View File
@@ -228,15 +228,6 @@ public class NonWorkingReason extends AppCompatActivity implements
protected void startCameraActivity() {
try {
/*Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
Uri outputFileUri = Uri.fromFile(file);
Intent intent = new Intent(
MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
startActivityForResult(intent, 0);*/
Log.i("MakeMachine", "startCameraActivity()");
File file = new File(_path);
@@ -247,23 +238,23 @@ public class NonWorkingReason extends AppCompatActivity implements
List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
for (int n = 0; n < list.size(); n++) {
if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
/* Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString());
Log.e("TAG", "package name : " + list.get(n).packageName);
*/
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
@@ -513,18 +504,30 @@ public class NonWorkingReason extends AppCompatActivity implements
}
public String getCurrentTime() {
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
@Override
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java
+26 -12
View File
@@ -85,10 +85,10 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
private FailureGetterSetter failureGetterSetter = null;
String _pathforcheck, _path, str;
String store_id, visit_date, username, intime, date,_UserId;
String store_id, visit_date, username, intime, date, _UserId;
private SharedPreferences preferences;
AlertDialog alert;
String img_str,strflag;
String img_str, strflag;
private GSKOrangeDB database;
String lat, lon;
@@ -97,12 +97,13 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
Toolbar toolbar;
boolean ResultFlag = true;
ArrayList<CoverageBean> coverage = new ArrayList<CoverageBean>();
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_storeimage);
preferences = PreferenceManager.getDefaultSharedPreferences(this);
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setHomeButtonEnabled(true);
@@ -182,7 +183,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
case R.id.img_cam_selfie:
_pathforcheck = store_id +"SI" + visit_date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg";
_pathforcheck = store_id + "SI_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.FILE_PATH + _pathforcheck;
@@ -276,18 +277,18 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
@@ -348,8 +349,9 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
@@ -376,7 +378,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
@Override
protected void onResume() {
super.onResume();
updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, ""));
updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
toolbar.setTitle(R.string.title_activity_store_image);
}
@@ -415,7 +417,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{
} else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
}
@@ -636,6 +638,7 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
}
}
public void showAlert(String str) {
AlertDialog.Builder builder = new AlertDialog.Builder(StoreimageActivity.this);
@@ -654,5 +657,16 @@ public class StoreimageActivity extends AppCompatActivity implements View.OnClic
}
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+25 -11
View File
@@ -187,10 +187,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
t2PGetterSetters.get(i).setGapsChecklist(gapsList);
t2PGetterSetters.get(i).setSkulist(skuList);
t2PGetterSetters.get(i).setBrandlist(brandList);
}
}
@@ -766,12 +762,28 @@ public class T2PComplianceActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item);
}
private static String arabicToenglish(String number) {
char[] chars = new char[number.length()];
for (int i = 0; i < number.length(); i++) {
char ch = number.charAt(i);
if (ch >= 0x0660 && ch <= 0x0669)
ch -= 0x0660 - '0';
else if (ch >= 0x06f0 && ch <= 0x06F9)
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTime() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
/* String intime = m_cal.get(Calendar.HOUR_OF_DAY) + ":"
+ m_cal.get(Calendar.MINUTE) + ":" + m_cal.get(Calendar.SECOND);*/
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}
return cdate;
}
@@ -793,17 +805,19 @@ public class T2PComplianceActivity extends AppCompatActivity {
//temp value in case camera is gallery app above jellybean
String packag = list.get(n).loadLabel(packageManager).toString();
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) {
if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") ||packag.equalsIgnoreCase("الاستوديو") ) {
gallery_package = list.get(n).packageName;
}
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")|| packag.equalsIgnoreCase("الكاميرا")) {
defaultCameraPackage = list.get(n).packageName;
break;
}
@@ -919,7 +933,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
error_msg = getResources().getString(R.string.click_image);
break;
}
else if (t2PGetterSetters.get(i).getBrandlist().size() == 0) {
else if (camera_allow.equals("0") && t2PGetterSetters.get(i).getBrandlist().size() == 0) {
flag = false;
error_msg = getResources().getString(R.string.title_activity_fill_brand);
break;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java
+26 -54
View File
@@ -51,12 +51,11 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
Spinner spinner_brand;
Button add;
ArrayList<BrandAvabilityGetterSetter> brand_list;
String categoryName,categoryId,brand_name="",brand_id="";
String categoryName, categoryId, brand_name = "", brand_id = "";
RecyclerView recyclerView;
ArrayList<BrandAvabilityGetterSetter> brand_new_list=new ArrayList<BrandAvabilityGetterSetter>();
ArrayList<BrandAvabilityGetterSetter> brand_new_list = new ArrayList<BrandAvabilityGetterSetter>();
T2pBrand_Avaibility.ValueAdapter adapteravabiblity;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -64,7 +63,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
spinner_brand = (Spinner) findViewById(R.id.spinner);
add = (Button) findViewById(R.id.button2);
add = (Button) findViewById(R.id.button2);
recyclerView = (RecyclerView) findViewById(R.id.layout_recycle);
@@ -87,7 +86,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
/////
brand_list = db.getBrandAvailbilitydata(store_id, categoryId,keyAccount_id,class_id,storeType_id);
brand_list = db.getBrandAvailbilitydata(store_id, categoryId, keyAccount_id, class_id, storeType_id);
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
String str = getResources().getString(R.string.select);
brand.setBRAND(str);
@@ -99,29 +98,25 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if(brand_new_list.size()>0)
{
BrandAvabilityGetterSetter br=new BrandAvabilityGetterSetter();
if (brand_new_list.size() > 0) {
BrandAvabilityGetterSetter br = new BrandAvabilityGetterSetter();
br.setCategoryId(categoryId);
br.setClass_id(class_id);
br.setKeyAccount_id(keyAccount_id);
br.setStoreType_id(storeType_id);
br.setStore_id(store_id);
db.InsertBrandAvabilitydata( br, brand_new_list);
db.InsertBrandAvabilitydata(br, brand_new_list);
brand_new_list.clear();
finish();
finish();
}
else{
} else {
Snackbar.make(view, "Please add data", Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
});
@@ -130,29 +125,27 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
@Override
public void onClick(View view) {
if (!brand_name.equalsIgnoreCase("") && brand_name!=null){
if (!brand_name.equalsIgnoreCase("") && brand_name != null) {
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
BrandAvabilityGetterSetter brand = new BrandAvabilityGetterSetter();
brand.setBRAND(brand_name);
brand.setBRAND_ID(brand_id);
brand.setBRAND(brand_name);
brand.setBRAND_ID(brand_id);
brand_new_list.add(brand);
brand_new_list.add(brand);
adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
recyclerView.setAdapter(adapteravabiblity);
recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
adapteravabiblity = new T2pBrand_Avaibility.ValueAdapter(T2pBrand_Avaibility.this, brand_new_list);
recyclerView.setAdapter(adapteravabiblity);
recyclerView.setLayoutManager(new LinearLayoutManager(T2pBrand_Avaibility.this));
spinner_brand.setSelection(0);
brand_name="";
brand_id="";
spinner_brand.setSelection(0);
brand_name = "";
brand_id = "";
}
else
{
Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
} else {
Snackbar.make(view, "Please select dropdown", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
}
});
@@ -177,10 +170,8 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
});
}
public class CustomAdapter extends ArrayAdapter<String> {
private Activity activity;
@@ -243,23 +234,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
}
}
private static boolean updateResources(Context context, String language) {
/*String lang;
@@ -285,7 +259,7 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{
} else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
}
@@ -302,7 +276,6 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
return true;
}
public class ValueAdapter extends RecyclerView.Adapter<T2pBrand_Avaibility.ValueAdapter.MyViewHolder> {
private LayoutInflater inflator;
@@ -356,5 +329,4 @@ public class T2pBrand_Avaibility extends AppCompatActivity {
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+40
View File
@@ -57,6 +57,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -89,6 +90,7 @@ public class DownloadActivity extends AppCompatActivity {
MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter;
MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter;
ShelfMasterGetterSetter shelfMasterGetterSetter;
MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowGetterSetter;
private Dialog dialog;
private ProgressBar pb;
@@ -813,6 +815,42 @@ public class DownloadActivity extends AppCompatActivity {
publishProgress(data);
//MAPPING_SUB_CATEGORY_IMAGE_ALLOW
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_SUB_CATEGORY_IMAGE_ALLOW");
request.addProperty("cultureid", culture_id);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
xpp.next();
eventType = xpp.getEventType();
mappingSubCategoryImageAllowGetterSetter = XMLHandlers.mappingSubCategoryImageAllowXMLHandler(xpp, eventType);
String table_ShelfMaster = mappingSubCategoryImageAllowGetterSetter.getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW();
if (table_ShelfMaster != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setMappingSubCategoryImageAllow(table_ShelfMaster);
}
if (mappingSubCategoryImageAllowGetterSetter.getSUB_CATEGORY_ID().size() > 0) {
data.value = 96;
data.name = "MAPPING_SUB_CATEGORY_IMAGE_ALLOW " + getResources().getString(R.string.download_data);
}
}
publishProgress(data);
//Images DownLoads
//MAPPING_PLANOGRAM Image save into folder
@@ -953,6 +991,8 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter);
db.InsertSHELF_MASTER(shelfMasterGetterSetter);
db.InsertMappingSubCategoryImageAllow(mappingSubCategoryImageAllowGetterSetter);
} catch (MalformedURLException e) {
ResultFlag = false;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+9 -6
View File
@@ -198,6 +198,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
str = CommonString.FILE_PATH + _pathforcheck;
prepareDefaultList();
//Camera
cameraMethod();
@@ -215,7 +217,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
db.InsertStore_wise_camera(cameraData);
}*/
if (validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
if (validateData(hashMapListHeaderData, hashMapListChildData)) {
AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this);
builder.setMessage(getResources().getString(R.string.check_save_message))
.setCancelable(false)
@@ -540,8 +542,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
}
boolean validateData(List<Stock_FacingGetterSetter> listDataHeader,
HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild,
Store_wise_camera_DataGetterSetter cameraData) {
HashMap<Stock_FacingGetterSetter, List<Stock_FacingGetterSetter>> listDataChild) {
boolean flag = true;
checkHeaderArray.clear();
@@ -1114,7 +1115,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
prepareDefaultList();
if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) {
camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
}else {
} else {
camera1.setBackgroundResource(R.mipmap.new_no_camera);
}
@@ -1149,7 +1150,8 @@ 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) {
if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
if (!camera_allow.equals("1")) {
db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
planogramShelfHeaderDataList, planogramHashMapListChildData);
@@ -1261,7 +1263,8 @@ 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) {
if (!validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) {
if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
if (!camera_allow.equals("1")) {
db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
planogramShelfHeaderDataList, planogramHashMapListChildData);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MappingSubCategoryImageAllowGetterSetter.java
+48
View File
@@ -0,0 +1,48 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
/**
* Created by yadavendras on 28-12-2016.
*/
public class MappingSubCategoryImageAllowGetterSetter {
String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
ArrayList<String> COUNTRY_ID = new ArrayList<>();
ArrayList<String> SUB_CATEGORY_ID = new ArrayList<>();
ArrayList<String> IMAGE_ALLOW = new ArrayList<>();
public String getTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW() {
return table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
}
public void setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(String table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW) {
this.table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW = table_MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
}
public ArrayList<String> getCOUNTRY_ID() {
return COUNTRY_ID;
}
public void setCOUNTRY_ID(String COUNTRY_ID) {
this.COUNTRY_ID.add(COUNTRY_ID);
}
public ArrayList<String> getSUB_CATEGORY_ID() {
return SUB_CATEGORY_ID;
}
public void setSUB_CATEGORY_ID(String SUB_CATEGORY_ID) {
this.SUB_CATEGORY_ID.add(SUB_CATEGORY_ID);
}
public ArrayList<String> getIMAGE_ALLOW() {
return IMAGE_ALLOW;
}
public void setIMAGE_ALLOW(String IMAGE_ALLOW) {
this.IMAGE_ALLOW.add(IMAGE_ALLOW);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+10
View File
@@ -25,6 +25,7 @@ public class TableBean {
public static String MAPPING_PLANOGRAM;
public static String MAPPING_SOS_TARGET;
public static String SHELF_MASTER;
public static String MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
public static String getAdditionalDisplay() {
@@ -178,4 +179,13 @@ public class TableBean {
}
//Gagan end code
public static String getMappingSubCategoryImageAllow() {
return MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
}
public static void setMappingSubCategoryImageAllow(String mappingSubCategoryImageAllow) {
MAPPING_SUB_CATEGORY_IMAGE_ALLOW = mappingSubCategoryImageAllow;
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+32
View File
@@ -20,6 +20,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
@@ -815,4 +816,35 @@ public class XMLHandlers {
return st;
}
public static MappingSubCategoryImageAllowGetterSetter mappingSubCategoryImageAllowXMLHandler(XmlPullParser xpp, int eventType) {
MappingSubCategoryImageAllowGetterSetter st = new MappingSubCategoryImageAllowGetterSetter();
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if (xpp.getName().equals("META_DATA")) {
st.setTable_MAPPING_SUB_CATEGORY_IMAGE_ALLOW(xpp.nextText());
}
if (xpp.getName().equals("COUNTRY_ID")) {
st.setCOUNTRY_ID(xpp.nextText());
}
if (xpp.getName().equals("SUB_CATEGORY_ID")) {
st.setSUB_CATEGORY_ID(xpp.nextText());
}
if (xpp.getName().equals("IMAGE_ALLOW")) {
st.setIMAGE_ALLOW(xpp.nextText());
}
}
xpp.next();
}
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return st;
}
}
GSKMTOrange/src/main/res/drawable/camera_orange_star_green.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

GSKMTOrange/src/main/res/layout/activity_category_picture.xml
+2 -2
View File
@@ -21,6 +21,8 @@
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_category_picture" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
@@ -29,6 +31,4 @@
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/save_icon" />
<include layout="@layout/content_category_picture" />
</android.support.design.widget.CoordinatorLayout>
GSKMTOrange/src/main/res/layout/activity_login.xml
+1 -7
View File
@@ -1,4 +1,3 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
@@ -20,9 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="8dp"
/>
android:layout_marginBottom="8dp"/>
<ScrollView
android:id="@+id/login_form"
@@ -43,7 +40,6 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_centerInParent="true"
android:layout_gravity="center_vertical"
android:background="@drawable/parinaam_logo" />
@@ -80,10 +76,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_userid"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
GSKMTOrange/src/main/res/layout/content_category_picture.xml
+1 -1
View File
@@ -30,7 +30,7 @@
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:background="@mipmap/camera_orange" />
android:background="@drawable/camera_orange_star_green" />
</LinearLayout>
GSKMTOrange/src/main/res/layout/contentcatgoryadpterlayout.xml
+5 -9
View File
@@ -21,33 +21,30 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:padding="10sp">
android:layout_alignParentTop="true">
<TextView
android:id="@+id/textviewname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="6sp"
android:layout_marginTop="7dp"
android:gravity="center"
android:text="Text View "
android:textSize="15sp"
android:textStyle="bold" />
<Button
android:id="@+id/cameranew"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_alignParentTop="true"
android:background="@mipmap/camera_orange"
android:focusable="false" />
@@ -56,11 +53,10 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_centerVertical="true"
android:layout_marginRight="80dp"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker.xml
+4 -3
View File
@@ -212,7 +212,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="10dp">
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp">
<Button
android:id="@+id/dialog_btn_addShelf"
@@ -221,7 +224,6 @@
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/stock_planogram_add_shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
@@ -233,7 +235,6 @@
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/cancel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
GSKMTOrange/src/main/res/layout/dialog_stock_facing_planogram_tracker_add_sku.xml
-2
View File
@@ -72,7 +72,6 @@
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/stock_planogram_add_sku_to_shelf"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
@@ -84,7 +83,6 @@
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:background="@color/colorPrimary"
android:padding="5dp"
android:text="@string/cancel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white" />
GSKMTOrange/src/main/res/values-ar/string.xml
+7 -7
View File
@@ -102,7 +102,8 @@
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="category_performance_oss">OSS</string>
<string name="dialog_title">Parinaam</string>
<string name="prompt_password">كلمة المرور</string>
<string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
<string name="prompt_password">Password/Şifre/كلمة المرور</string>
<string name="category_performance_period">الفترة</string>
<string name="Photo">صور</string>
<string name="category_performance_PLANOGRAM">بلانوجرام</string>
@@ -197,7 +198,6 @@
<string name="uploaddata">تحميل البيانات</string>
<string name="geotagdata">تحميل بيانات جغرافية...</string>
<string name="uploadimge">تحميل صور جغرافية</string>
<string name="prompt_userid">اسم المستخدم</string>
<string name="data_will_be_lost">هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة</string>
<string name="yes">نعم</string>
@@ -216,10 +216,10 @@
<string name="stock_planogram_data_add_shelf_position_already_exists">الرف/ الموقع موجود بالفعل</string>
<string name="stock_planogram_add_shelf">Add Shelf</string>
<string name="stock_planogram_add_sku">Add Sku</string>
<string name="stock_planogram_add_sku_to_shelf">Add Sku to Shelf</string>
<string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
<string name="stock_planogram_position_on_shelf">Position on Shelf</string>
<string name="stock_planogram_add_shelf">إضافة الرف</string>
<string name="stock_planogram_add_sku">الصنف إضافة</string>
<string name="stock_planogram_add_sku_to_shelf">إضافة منتج إلى الجرف</string>
<string name="stock_planogram_planogram_tracker">صورة مقطعية المقتفي</string>
<string name="stock_planogram_position_on_shelf">موقف بشأن الجرف</string>
</resources>
GSKMTOrange/src/main/res/values-tr/string.xml
+3
View File
@@ -260,6 +260,9 @@
<string name="stock_planogram_planogram_tracker">Planogram Tracker</string>
<string name="stock_planogram_position_on_shelf">Position on Shelf</string>
<string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
<string name="prompt_password">Password/Şifre/كلمة المرور</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+2 -2
View File
@@ -10,8 +10,8 @@
<!-- Strings related to login -->
<string name="prompt_email">E Mail</string>
<string name="prompt_userid">Username/Kullanıcı Adı</string>
<string name="prompt_password">Password/Şifre</string>
<string name="prompt_userid">Username/Kullanıcı Adı/اسم المستخدم</string>
<string name="prompt_password">Password/Şifre/كلمة المرور</string>
<string name="action_sign_in">Login/Giriş Yap</string>
<string name="action_sign_in_short">Sign in</string>
<string name="error_invalid_email">This email address is invalid</string>