YSY commit

This commit is contained in:
yadavendras
2019-05-24 18:11:05 +05:30
parent 242c49ae6e
commit aa51c3570e
35 changed files with 629 additions and 4200 deletions
+1
View File
@@ -28,6 +28,7 @@
android:name=".pharma_stores.PharmaActivity"
android:label="@string/title_activity_paharma"
android:screenOrientation="portrait"
android:configChanges="screenSize|orientation|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar"></activity>
<activity
android:name=".dailyentry.StockActivity"
@@ -42,6 +42,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GeoFencingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ImageGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
@@ -225,6 +226,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(CommonString.CREATE_TABLE_INSERT_SOS_PHARMA_DATA);//--Added 29.04.2019
db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_MSL_DATA);//--Added 30.04.2019
db.execSQL(TableBean.getTable_MAPPING_PHARMA_MSL());//--Added 16.05.2019
db.execSQL(CommonString.CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA);//--Added 20.05.2019
} catch (SQLException e) {
e.printStackTrace();
@@ -5226,7 +5228,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA DESC", null);
"' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null);
//"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);
}
@@ -7969,11 +7971,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
//Insert Store Detail Pharma stores
public void InsertStoreDetailPharma(
String storeId, List<MappingPharmaQuestionGetterSetter> hashMapListHeaderData,
HashMap<MappingPharmaQuestionGetterSetter, List<MappingPharmaQuestionGetterSetter>> hashMapListChildData) {
HashMap<MappingPharmaQuestionGetterSetter, List<MappingPharmaQuestionGetterSetter>> hashMapListChildData,
ImageGetterSetter imageData) {
db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null);
db.delete(CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null);
ContentValues values = new ContentValues();
ContentValues values1 = new ContentValues();
values1.put(CommonString.KEY_STORE_ID, storeId);
values1.put(CommonString.KEY_IMAGE1, imageData.getImage1());
values1.put(CommonString.KEY_IMAGE2, imageData.getImage2());
values1.put(CommonString.KEY_IMAGE3, imageData.getImage3());
values1.put(CommonString.KEY_IMAGE4, imageData.getImage4());
db.insert(CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA, null, values1);
try {
//db.beginTransaction();
@@ -8008,8 +8021,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"' AND "+
dbcursor = db.rawQuery("Select Distinct SP.QUESTION_ID , SP.BRAND, SP.BRAND_ID, SP.SUB_CATEGORY_ID, SP.SUB_CATEGORY, ifnull(SS.GSK_FACING,'') GSK_FACING, ifnull(SS.COMPETITION_FACING,'') COMPETITION_FACING " +
" from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +" SP LEFT JOIN "+ CommonString.TABLE_INSERT_SOS_PHARMA_DATA+
" SS ON (SP.SUB_CATEGORY_ID = SS.SUB_CATEGORY_ID) AND (SP.BRAND_ID = SS.BRAND_ID) where SP.STORE_ID ='" + store_id + "' AND SP.QUESTION_ID='"+ questionId +"' AND "+
CommonString.KEY_PRESENT +"='1'", null);
if (dbcursor != null) {
@@ -8022,6 +8036,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
cd.setSUB_CATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY_ID)));
cd.setSUB_CATEGORY(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_CATEGORY)));
cd.setGskFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_GSK_FACING)));
cd.setCompetitorFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COMPETITION_FACING)));
list.add(cd);
dbcursor.moveToNext();
@@ -8072,8 +8088,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"'", null);
if(questionId==null){
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null);
}
else {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"'", null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -8153,7 +8175,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
PharmaMSLInsertedGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
values.put(CommonString.KEY_STORE_ID, storeId);
values.put(CommonString.KEY_BRAND_ID, data.getBrandId());
values.put(CommonString.KEY_BRAND_ID, hashMapListHeaderData.get(i).getBrand_id());
values.put(CommonString.KEY_SKU, data.getSku());
values.put(CommonString.KEY_SKU_ID, data.getSkuId());
values.put(CommonString.KEY_PRESENT, data.getPresent());
@@ -8274,4 +8296,66 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
return list;
}
//Get Pharma Store detail Image Inserted Data
public ImageGetterSetter getStoreDetailPharmaImageInsertedData(String store_id) {
ImageGetterSetter cd = new ImageGetterSetter();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
cd.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE1)));
cd.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE2)));
cd.setImage3(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE3)));
cd.setImage4(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE4)));
dbcursor.moveToNext();
}
dbcursor.close();
return cd;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
return cd;
}
return cd;
}
//Get Pharma Store MSL Inserted Data
public ArrayList<PharmaMSLInsertedGetterSetter> getPharmaMSLInsertedData(String store_id) {
ArrayList<PharmaMSLInsertedGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_PHARMA_MSL_DATA +
" where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
PharmaMSLInsertedGetterSetter data = new PharmaMSLInsertedGetterSetter();
data.setBrandId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID)));
data.setSkuId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SKU_ID)));
data.setPresent(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)));
list.add(data);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
return list;
}
return list;
}
}
@@ -685,10 +685,12 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
if (result.equals(CommonString.KEY_SUCCESS)) {
// database.open();
/* if (preferences.getString(CommonString.KEY_VERSION, "").equals(
Integer.toString(versionCode))) {
//set true for South Africa
boolean forSA = true;
// database.open();
if(forSA){
//For SA Only
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
Intent intent = new Intent(getBaseContext(),
@@ -702,51 +704,58 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
setLanguageDataFromSharedPreferences();
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
Intent in = new Intent(getApplicationContext(), MPinActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
startActivity(in);
finish();
//uploadPreviousImages();
}
} else {
Intent intent = new Intent(getBaseContext(),
AutoUpdateActivity.class);
intent.putExtra(CommonString.KEY_PATH,
preferences.getString(CommonString.KEY_PATH, ""));
startActivity(intent);
finish();
}*/
//For SA Only
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
Intent intent = new Intent(getBaseContext(),
SelectLanguageActivity.class);
intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
startActivity(intent);
finish();
} else {
setLanguageDataFromSharedPreferences();
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
Intent in = new Intent(getApplicationContext(), MPinActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
startActivity(in);
finish();
//uploadPreviousImages();
}
else {
//for other than SA
if (preferences.getString(CommonString.KEY_VERSION, "").equals(
Integer.toString(versionCode))) {
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
Intent intent = new Intent(getBaseContext(),
SelectLanguageActivity.class);
intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
startActivity(intent);
finish();
} else {
setLanguageDataFromSharedPreferences();
Intent in = new Intent(getApplicationContext(), MPinActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
startActivity(in);
finish();
//uploadPreviousImages();
}
} else {
Intent intent = new Intent(getBaseContext(),
AutoUpdateActivity.class);
intent.putExtra(CommonString.KEY_PATH,
preferences.getString(CommonString.KEY_PATH, ""));
startActivity(intent);
finish();
}
}
}
dialog.dismiss();
}
@@ -57,6 +57,8 @@ public class CommonString {
public static final String KEY_IMAGE = "IMAGE";
public static final String KEY_IMAGE1 = "IMAGE1";
public static final String KEY_IMAGE2 = "IMAGE2";
public static final String KEY_IMAGE3 = "IMAGE3";
public static final String KEY_IMAGE4 = "IMAGE4";
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";
@@ -1205,6 +1207,7 @@ public class CommonString {
+ ")";
public static final String TABLE_INSERT_STORE_PROFILE_DATA = "Store_Profile_Data";
public static final String TABLE_INSERT_PHARMA_IMAGE_DATA = "PHARMA_IMAGE_DATA";
public static final String KEY_QUESTION_ID = "QUESTION_ID";
public static final String KEY_QUESTION = "QUESTION";
@@ -1220,6 +1223,17 @@ public class CommonString {
+ KEY_BRAND + " VARCHAR,"
+ KEY_IMAGE + " VARCHAR,"
+ KEY_PRESENT + " INTEGER)";
public static final String CREATE_TABLE_INSERT_PHARMA_IMAGE_DATA = "CREATE TABLE IF NOT EXISTS " + TABLE_INSERT_PHARMA_IMAGE_DATA
+ " ("
+ KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT ,"
+ KEY_STORE_ID + " INTEGER, "
+ KEY_IMAGE1 + " VARCHAR,"
+ KEY_IMAGE2 + " VARCHAR,"
+ KEY_IMAGE3 + " VARCHAR,"
+ KEY_IMAGE4 + " INTEGER)";
public static final String TABLE_INSERT_SOS_PHARMA_DATA = "SOS_PHARMA_DATA";
public static final String KEY_GSK_FACING= "GSK_FACING";
public static final String KEY_COMPETITION_FACING = "COMPETITION_FACING";
@@ -287,7 +287,7 @@ public class CheckoutActivity extends AppCompatActivity {
showAlert(getString(R.string.checkout_successful));
finish();
//finish();
} else if (!result.equals("")) {
/*AlertMessage message = new AlertMessage(
@@ -1431,6 +1431,9 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
else if(isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)){
from_checkedIn = getString(R.string.additional_stores);
return true;
}else if(isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)){
from_checkedIn = getString(R.string.pharma_stores);
return true;
}
}
else if(store_flag_str.equals(CommonString.FROM_ADDITIONAL)){
@@ -1442,6 +1445,22 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
else if(isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)){
from_checkedIn = getString(R.string.adhoc);
return true;
}else if(isCheckedInFromStoreFlag(CommonString.FROM_PHARMA)){
from_checkedIn = getString(R.string.pharma_stores);
return true;
}
}else if(store_flag_str.equals(CommonString.FROM_PHARMA)){
if(isCheckedInFromStoreFlag(CommonString.FROM_JCP)){
from_checkedIn = getString(R.string.jcp);
return true;
}
else if(isCheckedInFromStoreFlag(CommonString.FROM_DEVIATION)){
from_checkedIn = getString(R.string.adhoc);
return true;
}else if(isCheckedInFromStoreFlag(CommonString.FROM_ADDITIONAL)){
from_checkedIn = getString(R.string.additional_stores);
return true;
}
}else {
if(isCheckedInFromStoreFlag(CommonString.FROM_JCP)){
@@ -793,53 +793,61 @@ public class MPinActivity extends AppCompatActivity implements
if (result.equals(CommonString.KEY_SUCCESS)) {
// database.open();
/* if (preferences.getString(CommonString.KEY_VERSION, "").equals(
Integer.toString(versionCode))) {
//set true for South Africa
boolean forSA = true;
setLanguageDataFromSharedPreferences();
if(forSA){
//For SA Only
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
Intent in = new Intent(getApplicationContext(), MainActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
startActivity(in);
finish();
Intent intent = new Intent(getBaseContext(),
SelectLanguageActivity.class);
intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
startActivity(intent);
} else {
finish();
} else {
Intent intent = new Intent(getBaseContext(),
AutoUpdateActivity.class);
setLanguageDataFromSharedPreferences();
intent.putExtra(CommonString.KEY_PATH,
preferences.getString(CommonString.KEY_PATH, ""));
startActivity(intent);
finish();
}*/
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
//For SA Only
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) {
Intent intent = new Intent(getBaseContext(),
MainActivity.class);
startActivity(intent);
Intent intent = new Intent(getBaseContext(),
SelectLanguageActivity.class);
finish();
intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs);
startActivity(intent);
finish();
} else {
setLanguageDataFromSharedPreferences();
CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
Intent intent = new Intent(getBaseContext(),
MainActivity.class);
startActivity(intent);
finish();
//uploadPreviousImages();
//uploadPreviousImages();
}
}
else {
//for other than SA
//database.open();
if (preferences.getString(CommonString.KEY_VERSION, "").equals(
Integer.toString(versionCode))) {
setLanguageDataFromSharedPreferences();
Intent in = new Intent(getApplicationContext(), MainActivity.class);
in.putExtra(CommonString.IS_PASSWORD_CHECK, false);
startActivity(in);
finish();
} else {
Intent intent = new Intent(getBaseContext(),
AutoUpdateActivity.class);
intent.putExtra(CommonString.KEY_PATH,
preferences.getString(CommonString.KEY_PATH, ""));
startActivity(intent);
finish();
}
}
}
dialog.dismiss();
}
@@ -242,7 +242,7 @@ public class MSLFragment extends Fragment {
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
//childDataList = new ArrayList<>();
childDataList = new ArrayList<>();
//childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (childDataList.size() == 0) {
childDataList = db.getPharmaMSLSKUData(headerDataList.get(i).getBrand_id());
@@ -435,8 +435,8 @@ public class MSLFragment extends Fragment {
public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild,
View convertView, ViewGroup parent) {
final MSL_AvailabilityStockFacingGetterSetter childData =
(MSL_AvailabilityStockFacingGetterSetter) getChild(groupPosition, childPosition);
final PharmaMSLInsertedGetterSetter childData =
(PharmaMSLInsertedGetterSetter) getChild(groupPosition, childPosition);
ViewHolder holder = null;
if (convertView == null) {
@@ -498,7 +498,7 @@ public class MSLFragment extends Fragment {
finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
//finalHolder1.img_cam.setVisibility(View.VISIBLE);
childData.setIsChecked(1);
childData.setPresent(1);
//adapter.notifyDataSetChanged();
}
if (finalHolder1.radio_no.isChecked()){
@@ -507,7 +507,7 @@ public class MSLFragment extends Fragment {
finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
//finalHolder1.img_cam.setVisibility(View.GONE);
childData.setIsChecked(0);
childData.setPresent(0);
//adapter.notifyDataSetChanged();
}
}
@@ -529,14 +529,14 @@ public class MSLFragment extends Fragment {
*/
if(childData.getIsChecked()==1){
if(childData.getPresent()==1){
holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
//holder.img_cam.setVisibility(View.VISIBLE);
holder.radio_yes.setChecked(true);
//notifyDataSetChanged();
}
else if(childData.getIsChecked()==0){
else if(childData.getPresent()==0){
holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
//holder.img_cam.setVisibility(View.GONE);
@@ -561,40 +561,13 @@ public class MSLFragment extends Fragment {
if (!checkflag) {
boolean tempflag = false;
if (childData.getCompany_id().equals("1")) {
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
/* if (holder.facing.getText().toString().equals("")) {
holder.facing.setBackgroundColor(getResources().getColor(R.color.white));
holder.facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark));
holder.facing.setHint(getString(R.string.empty));
tempflag = true;
}*/
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
return convertView;
@@ -42,6 +42,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.ImageGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
@@ -53,7 +54,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
* Use the {@link StoreDetailFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class StoreDetailFragment extends Fragment {
public class StoreDetailFragment extends Fragment implements View.OnClickListener {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String CategoryName = "categoryName";
@@ -76,6 +77,8 @@ public class StoreDetailFragment extends Fragment {
ExpandableListView expandableListView;
ExpandableListAdapter adapter;
ImageView img_camera1, img_camera2, img_camera3, img_camera4;
ArrayList<MappingPharmaQuestionGetterSetter> headerDataList;
ArrayList<MappingPharmaQuestionGetterSetter> childDataList;
//List<MappingPharmaQuestionGetterSetter> hashMapListHeaderData;
@@ -89,11 +92,13 @@ public class StoreDetailFragment extends Fragment {
String gallery_package = "";
Uri outputFileUri;
String str = CommonString.FILE_PATH, path = "", _pathforcheck = "";
String str = CommonString.FILE_PATH, path = "", _pathforcheck = "", pathForCam1 = "", pathForCam2 = "", pathForCam3 = "", pathForCam4 = "";
int child_position = -1;
int group_position = -1;
ImageGetterSetter imageGetterSetter = new ImageGetterSetter();
public StoreDetailFragment() {
// Required empty public constructor
}
@@ -132,6 +137,16 @@ public class StoreDetailFragment extends Fragment {
View view = inflater.inflate(R.layout.fragment_storedetail, container, false);
expandableListView = (ExpandableListView) view.findViewById(R.id.expandableListView);
img_camera1 = (ImageView) view.findViewById(R.id.img_camera1);
img_camera2 = (ImageView) view.findViewById(R.id.img_camera2);
img_camera3 = (ImageView) view.findViewById(R.id.img_camera3);
img_camera4 = (ImageView) view.findViewById(R.id.img_camera4);
img_camera1.setOnClickListener(this);
img_camera2.setOnClickListener(this);
img_camera3.setOnClickListener(this);
img_camera4.setOnClickListener(this);
fab = (FloatingActionButton) getActivity().findViewById(R.id.fab);
preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
@@ -159,30 +174,51 @@ public class StoreDetailFragment extends Fragment {
@Override
public void onClick(View v) {
if(validateData(headerDataList, hashMapListChildData)){
db.InsertStoreDetailPharma(store_id, headerDataList, hashMapListChildData);
onButtonPressed();
}
else {
for (int i = 0; i < adapter.getGroupCount(); i++)
expandableListView.expandGroup(i);
if(pathForCam1.equals("") && pathForCam2.equals("") && pathForCam3.equals("") && pathForCam4.equals("")){
Error_Message = getResources().getString(R.string.click_image);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(Error_Message)
.setCancelable(false)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
expandableListView.smoothScrollToPosition(scrollPosition);
dialog.dismiss();
}
});
AlertDialog alert = builder.create();
alert.show();
}
else {
if (validateData(headerDataList, hashMapListChildData)) {
imageGetterSetter.setImage1(pathForCam1);
imageGetterSetter.setImage2(pathForCam2);
imageGetterSetter.setImage3(pathForCam3);
imageGetterSetter.setImage4(pathForCam4);
db.InsertStoreDetailPharma(store_id, headerDataList, hashMapListChildData, imageGetterSetter);
onButtonPressed();
} else {
for (int i = 0; i < adapter.getGroupCount(); i++)
expandableListView.expandGroup(i);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(Error_Message)
.setCancelable(false)
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
expandableListView.smoothScrollToPosition(scrollPosition);
dialog.dismiss();
}
});
AlertDialog alert = builder.create();
alert.show();
}
}
}
});
return view;
}
@@ -210,6 +246,46 @@ public class StoreDetailFragment extends Fragment {
mListener = null;
}
@Override
public void onClick(View v) {
int id = v.getId();
switch (id) {
case R.id.img_camera1:
_pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(1);
break;
case R.id.img_camera2:
_pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(2);
break;
case R.id.img_camera3:
_pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(3);
break;
case R.id.img_camera4:
_pathforcheck = "Pharma_MSL_Top_Image_" + store_id + "_" + visit_date.replace("/", "") + "_" +
CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
path = str + _pathforcheck;
startCameraActivity(4);
break;
}
}
/**
* This interface must be implemented by activities that contain this
* fragment to allow an interaction in this fragment to be communicated
@@ -227,26 +303,53 @@ public class StoreDetailFragment extends Fragment {
private void prepareList() {
try {
//set image data
imageGetterSetter = db.getStoreDetailPharmaImageInsertedData(store_id);
if(imageGetterSetter.getImage1()!=null && !imageGetterSetter.getImage1().equals("")){
pathForCam1 = imageGetterSetter.getImage1();
img_camera1.setBackgroundResource(R.mipmap.camera_green);
}
if(imageGetterSetter.getImage2()!=null && !imageGetterSetter.getImage2().equals("")){
pathForCam2 = imageGetterSetter.getImage2();
img_camera2.setBackgroundResource(R.mipmap.camera_green);
}
if(imageGetterSetter.getImage3()!=null && !imageGetterSetter.getImage3().equals("")){
pathForCam3 = imageGetterSetter.getImage3();
img_camera3.setBackgroundResource(R.mipmap.camera_green);
}
if(imageGetterSetter.getImage4()!=null && !imageGetterSetter.getImage4().equals("")){
pathForCam4 = imageGetterSetter.getImage4();
img_camera4.setBackgroundResource(R.mipmap.camera_green);
}
//set expandable data
//hashMapListHeaderData = new ArrayList<>();
hashMapListChildData = new HashMap<>();
//Header
headerDataList = db.getStoreDetailPharmaQuestionInsertedData(store_id);
//if inserted data not found
if(headerDataList.size()==0){
if (headerDataList.size() == 0) {
//default question data
headerDataList = db.getPharmaQuestionsData();
for (int i = 0; i < headerDataList.size(); i++) {
for (int i = 0; i < headerDataList.size(); i++) {
//childDataList = new ArrayList<>();
childDataList = db.getPharmaAnswerData(headerDataList.get(i).getQUESTION_ID().get(0));
//childDataList = new ArrayList<>();
childDataList = db.getPharmaAnswerData(headerDataList.get(i).getQUESTION_ID().get(0));
hashMapListChildData.put(headerDataList.get(i), childDataList);
}
}
else {
hashMapListChildData.put(headerDataList.get(i), childDataList);
}
} else {
for (int i = 0; i < headerDataList.size(); i++) {
@@ -481,7 +584,7 @@ public class StoreDetailFragment extends Fragment {
childData.setIsChecked(1);
//adapter.notifyDataSetChanged();
}
if (finalHolder1.radio_no.isChecked()){
if (finalHolder1.radio_no.isChecked()) {
finalHolder1.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
finalHolder1.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
@@ -497,32 +600,30 @@ public class StoreDetailFragment extends Fragment {
holder.img_cam.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
_pathforcheck = "Pharma_MSL_Image_" + store_id + categoryId + "_" + childData.getBRAND_ID() + visit_date.replace("/", "") + "_" +
_pathforcheck = "Pharma_MSL_Image_" + store_id + "_" + childData.getBRAND_ID().get(0) + visit_date.replace("/", "") + "_" +
CommonFunctions.getCurrentTimeWithLanguage(getActivity()).replace(":", "") + ".jpg";
child_position = childPosition;
group_position = groupPosition;
path = str + _pathforcheck;
startCameraActivity(1);
startCameraActivity(5);
}
});
if(childData.getIsChecked()==1){
if (childData.getIsChecked() == 1) {
holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_green));
holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
holder.img_cam.setVisibility(View.VISIBLE);
holder.radio_yes.setChecked(true);
//notifyDataSetChanged();
}
else if(childData.getIsChecked()==0){
} else if (childData.getIsChecked() == 0) {
holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_red));
holder.img_cam.setVisibility(View.GONE);
holder.radio_no.setChecked(true);
//notifyDataSetChanged();
}else {
} else {
holder.radio_yes.setBackground(getActivity().getResources().getDrawable(R.mipmap.yes_white));
holder.radio_no.setBackground(getActivity().getResources().getDrawable(R.mipmap.no_white));
holder.img_cam.setVisibility(View.GONE);
@@ -530,10 +631,9 @@ public class StoreDetailFragment extends Fragment {
//notifyDataSetChanged();
}
if(childData.getImgPath().equals("")){
if (childData.getImgPath().equals("")) {
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
}
else {
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
}
@@ -549,13 +649,13 @@ public class StoreDetailFragment extends Fragment {
}*/
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
if (tempflag) {
//holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
holder.lin_category.setBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
//holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white));
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
}
}
@@ -604,14 +704,15 @@ public class StoreDetailFragment extends Fragment {
gallery_package = list.get(n).packageName;
}
boolean b = packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا");
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
if (b) {
defaultCameraPackage = list.get(n).packageName;
break;
}
} else {
if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) {
if (b) {
defaultCameraPackage = list.get(n).packageName;
break;
@@ -660,22 +761,58 @@ public class StoreDetailFragment extends Fragment {
break;
}*/
switch (requestCode) {
case 1:
if (resultCode == 0) {
Log.e("Stock & Facing", "User cancelled");
} else if (resultCode == -1) {
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
switch (resultCode) {
hashMapListChildData.get(headerDataList.get(group_position)).get(child_position).setImgPath(_pathforcheck);
case 0:
Log.e("Stock & Facing", "User cancelled");
break;
expandableListView.invalidateViews();
adapter.notifyDataSetChanged();
_pathforcheck = "";
case -1:
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
switch (requestCode) {
case 1:
pathForCam1 = _pathforcheck;
_pathforcheck = "";
img_camera1.setBackgroundResource(R.mipmap.camera_green);
break;
case 2:
pathForCam2 = _pathforcheck;
_pathforcheck = "";
img_camera2.setBackgroundResource(R.mipmap.camera_green);
break;
case 3:
pathForCam3 = _pathforcheck;
_pathforcheck = "";
img_camera3.setBackgroundResource(R.mipmap.camera_green);
break;
case 4:
pathForCam4 = _pathforcheck;
_pathforcheck = "";
img_camera4.setBackgroundResource(R.mipmap.camera_green);
break;
default:
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
hashMapListChildData.get(headerDataList.get(group_position)).get(child_position).setImgPath(_pathforcheck);
expandableListView.invalidateViews();
adapter.notifyDataSetChanged();
_pathforcheck = "";
}
}
}
}
}
break;
}
@@ -709,17 +846,16 @@ public class StoreDetailFragment extends Fragment {
int isChecked = data.getIsChecked();
String imgPath = data.getImgPath();
if(isChecked==-1){
if (isChecked == -1) {
scrollPosition = i + j + childCount;
flag = false;
Error_Message = getResources().getString(R.string.msg_select_present);
break;
}
else if (isChecked==1) {
} else if (isChecked == 1) {
if(imgPath == null || imgPath.equals("")){
if (imgPath == null || imgPath.equals("")) {
scrollPosition = i + j + childCount;
@@ -506,7 +506,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
//+ "[USERID]" + userId + "[/USERID]"
+ "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ "[SKID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKID]"
+ "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
@@ -66,10 +66,14 @@ import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ImageGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.PharmaSOSGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.PromoComplianceSkuwiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
@@ -323,7 +327,7 @@ public class UploadActivity extends AppCompatActivity {
if (!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_D) && (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_Y) ||
storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_UN))) {
String camera_allow = storeData.getCAMERA_ALLOW();
@@ -337,11 +341,11 @@ public class UploadActivity extends AppCompatActivity {
String coverage_service, status_service;
if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)) {
status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_ADDITIONAL;
coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_ADDITIONAL;
}else if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)){
} else if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)) {
status_service = CommonString.METHOD_UPLOAD_COVERAGE_STATUS_PHARMA;
coverage_service = CommonString.METHOD_UPLOAD_COVERAGE_NEW_PHARMA;
@@ -517,7 +521,7 @@ public class UploadActivity extends AppCompatActivity {
data.name = getString(R.string.stock_data_uploading);
publishProgress(data);*/
if(coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)){
if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_ADDITIONAL)) {
//MSL_Availability_StockFacing
String mslAvailability_stockFacing_xml = "";
@@ -573,8 +577,161 @@ public class UploadActivity extends AppCompatActivity {
data.value = 15;
data.name = getString(R.string.availability_data_uploading);
publishProgress(data);
}
else {
} else if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)) {
//Pharmacy store data
//Store detail
String store_detail_xml = "";
onXML = "";
db.open();
ImageGetterSetter imageGetterSetter = db.getStoreDetailPharmaImageInsertedData(coverageList.get(i).getStoreId());
String image_xml = "";
image_xml = "[IMG_L]"
+ "[IMG1]" + imageGetterSetter.getImage1() + "[/IMG1]"
+ "[IMG2]" + imageGetterSetter.getImage2() + "[/IMG2]"
+ "[IMG3]" + imageGetterSetter.getImage3() + "[/IMG3]"
+ "[IMG4]" + imageGetterSetter.getImage4() + "[/IMG4]" +
"[/IMG_L]";
ArrayList<MappingPharmaQuestionGetterSetter> pharmaStoreDetail = db.getStoreDetailPharmaAnswerInsertedData(coverageList.get(i).getStoreId(), null);
if (pharmaStoreDetail.size() > 0) {
for (int j = 0; j < pharmaStoreDetail.size(); j++) {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
+ "[USERID]" + userId + "[/USERID]"
+ "[QID]" + Integer.parseInt(pharmaStoreDetail.get(j).getQUESTION_ID().get(0)) + "[/QID]"
+ "[BID]" + Integer.parseInt(pharmaStoreDetail.get(j).getBRAND_ID().get(0)) + "[/BID]"
+ "[SCID]" + Integer.parseInt(pharmaStoreDetail.get(j).getSUB_CATEGORY_ID().get(0)) + "[/SCID]"
+ "[PRESENT]" + pharmaStoreDetail.get(j).getIsChecked() + "[/PRESENT]"
+ "[IMG]" + pharmaStoreDetail.get(j).getImgPath() + "[/IMG]" +
"[/ST]";
store_detail_xml = store_detail_xml + onXML;
}
final String sos_xml = "[DATA]" + image_xml+ store_detail_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "PHARMA_STORE_DETAIL");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
}
data.value = 15;
data.name = getString(R.string.availability_data_uploading);
publishProgress(data);
String pharma_sos_xml = "";
onXML = "";
ArrayList<PharmaSOSGetterSetter> pharmaSOSList = db.getStoreDetailPharmaForSOSData(coverageList.get(i).getStoreId(), "1");
if (pharmaSOSList.size() > 0) {
for (int j = 0; j < pharmaSOSList.size(); j++) {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
+ "[USERID]" + userId + "[/USERID]"
+ "[QID]" + Integer.parseInt(pharmaSOSList.get(j).getQUESTION_ID()) + "[/QID]"
+ "[BID]" + Integer.parseInt(pharmaSOSList.get(j).getBRAND_ID()) + "[/BID]"
+ "[SCID]" + Integer.parseInt(pharmaSOSList.get(j).getSUB_CATEGORY_ID()) + "[/SCID]"
+ "[G_FAC]" + pharmaSOSList.get(j).getGskFacing() + "[/G_FAC]"
+ "[C_FAC]" + pharmaSOSList.get(j).getCompetitorFacing() + "[/C_FAC]" +
"[/ST]";
pharma_sos_xml = pharma_sos_xml + onXML;
}
final String sos_xml = "[DATA]" + pharma_sos_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "PHARMA_SOS");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
}
data.value = 15;
data.name = getString(R.string.availability_data_uploading);
publishProgress(data);
String pharma_msl_xml = "";
onXML = "";
ArrayList<PharmaMSLInsertedGetterSetter> pharmaMSLList = db.getPharmaMSLInsertedData(coverageList.get(i).getStoreId());
if (pharmaMSLList.size() > 0) {
for (int j = 0; j < pharmaMSLList.size(); j++) {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
+ "[USERID]" + userId + "[/USERID]"
+ "[BID]" + Integer.parseInt(pharmaMSLList.get(j).getBrandId()) + "[/BID]"
+ "[SKID]" + Integer.parseInt(pharmaMSLList.get(j).getSkuId()) + "[/SKID]"
+ "[PRESENT]" + pharmaMSLList.get(j).getPresent() + "[/PRESENT]"+
"[/ST]";
pharma_msl_xml = pharma_msl_xml + onXML;
}
final String sos_xml = "[DATA]" + pharma_msl_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "PHARMA_MSL");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
/*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}*/
}
data.value = 15;
data.name = getString(R.string.availability_data_uploading);
publishProgress(data);
} else {
//MSL_Availability_StockFacing
String mslAvailability_stockFacing_xml = "";
onXML = "";
@@ -594,7 +751,7 @@ public class UploadActivity extends AppCompatActivity {
onXML = "[ST]"
+ "[MID]" + mid + "[/MID]"
//+ "[USERID]" + userId + "[/USERID]"
+ "[SID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SID]"
+ "[SKID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKID]"
+ "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]"
+ "[AVL]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVL]"
+ "[FC]" + Double.parseDouble(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FC]"
@@ -699,7 +856,7 @@ public class UploadActivity extends AppCompatActivity {
if (!promoComplianceSkuwiseGetterSetters.get(i1).getCategory_id().equals("0")) {
String discount_val = promoComplianceSkuwiseGetterSetters.get(i1).getDiscount_value();
if(discount_val.equals("")){
if (discount_val.equals("")) {
discount_val = "0";
}
@@ -1385,7 +1542,7 @@ public class UploadActivity extends AppCompatActivity {
for (int l = 0; l < counterfeitProductExistsGetterSetters.size(); l++) {
add_product_data_xml ="";
add_product_data_xml = "";
counterfeitProductGetterSetters = db.getCounterfeitProductAfterData(counterfeitProductExistsGetterSetters.get(l).get_id(), null);
@@ -0,0 +1,38 @@
package cpm.com.gskmtorange.xmlGetterSetter;
public class ImageGetterSetter {
String image1="", image2="", image3="", image4="";
public String getImage1() {
return image1;
}
public void setImage1(String image1) {
this.image1 = image1;
}
public String getImage2() {
return image2;
}
public void setImage2(String image2) {
this.image2 = image2;
}
public String getImage3() {
return image3;
}
public void setImage3(String image3) {
this.image3 = image3;
}
public String getImage4() {
return image4;
}
public void setImage4(String image4) {
this.image4 = image4;
}
}
@@ -1,13 +0,0 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.androidbuts.multispinnerfilter;
public final class BuildConfig {
public static final boolean DEBUG = false;
public static final String APPLICATION_ID = "com.androidbuts.multispinnerfilter";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\release\jniLibs"/></dataSet></merger>
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\release\shaders"/></dataSet></merger>
@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\assets"/><source path="D:\GITHub\GSKORANGEV2\library\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\release\assets"/></dataSet></merger>
@@ -1,6 +0,0 @@
#Fri May 17 18:44:04 IST 2019
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_single.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_multiple.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\activity_main.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\alert_dialog_listview_search.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\textview_for_spinner.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style>
<style name="MaterialSpinner" parent="Material.Widget.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style>
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style>
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style>
<declare-styleable name="MultiSpinnerSearch">
<attr format="string" name="hintText"/>
</declare-styleable>
</resources>
@@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ColorPrimary">#29CA97</color>
<color name="ColorPrimaryDark">#06ACE4</color>
<color name="android_text_color">#747474</color>
<color name="app_topbar_color">#AAAAAA</color>
<color name="background_color">#E1E2E2</color>
<color name="black">#000000</color>
<color name="blue">#1589FF</color>
<color name="cyan">#00FFFF</color>
<color name="gray">#D1D0CE</color>
<color name="lightBlue">#ADD8E6</color>
<color name="list_background">#06ACE4</color>
<color name="list_even">#AAAAAA</color>
<color name="list_header">#99979C</color>
<color name="list_odd">#E1E2E2</color>
<color name="list_selected">#455FB6</color>
<color name="primary">#3f51b5</color>
<color name="primary_dark">#303f9f</color>
<color name="primary_pressed">#E1E2E2</color>
<color name="red">#FF0000</color>
<color name="ripple">#F06292</color>
<color name="text_color">#686868</color>
<color name="white">#FFFFFF</color>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<string name="type_to_search">Type to Search</string>
<style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style>
<style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style>
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style>
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style>
</resources>
@@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\res"/><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\rs\release"/><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\res"><file name="activity_main" path="D:\GITHub\GSKORANGEV2\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\GITHub\GSKORANGEV2\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\GITHub\GSKORANGEV2\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\GITHub\GSKORANGEV2\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\GITHub\GSKORANGEV2\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style><style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style><style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style><style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
<attr format="string" name="hintText"/>
</declare-styleable></file><file path="D:\GITHub\GSKORANGEV2\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style><style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style><style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style><style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file></source><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\rs\release"/><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\release\res"/></dataSet><mergedItems/></merger>
@@ -1,19 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.androidbuts.multispinnerfilter.MultiSpinner
android:id="@+id/simpleMultiSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp" />
<com.androidbuts.multispinnerfilter.MultiSpinnerSearch
android:id="@+id/searchMultiSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_marginTop="20dp" />
</LinearLayout>
@@ -1,46 +0,0 @@
<?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="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<EditText
android:id="@+id/alertSearchEditText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/type_to_search"
android:inputType="text">
<requestFocus />
</EditText>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<ListView
android:id="@+id/alertSearchListView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:cacheColorHint="@null"
android:fadeScrollbars="true"
android:fastScrollEnabled="true"
android:textFilterEnabled="true" />
<TextView
android:id="@+id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="Not found!"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/red" />
</RelativeLayout>
</LinearLayout>
@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="15dp">
<TextView
android:id="@+id/alertTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/alertCheckbox"
android:text="Item Name"
android:textAppearance="?android:attr/textAppearanceMedium" />
<CheckBox
android:id="@+id/alertCheckbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:clickable="false" />
</RelativeLayout>
@@ -1,16 +0,0 @@
<?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:tools="http://schemas.android.com/tools"
android:padding="10dp">
<TextView
android:id="@+id/alertTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
tools:text="Item Name"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/listTextViewSpinner"
android:paddingLeft="5dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:background="@null"
android:singleLine="false"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textColor="#FF000000" />
@@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style>
<style name="MaterialSpinner" parent="Material.Widget.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style>
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style>
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style>
<declare-styleable name="MultiSpinnerSearch">
<attr format="string" name="hintText"/>
</declare-styleable>
</resources>
@@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ColorPrimary">#29CA97</color>
<color name="ColorPrimaryDark">#06ACE4</color>
<color name="android_text_color">#747474</color>
<color name="app_topbar_color">#AAAAAA</color>
<color name="background_color">#E1E2E2</color>
<color name="black">#000000</color>
<color name="blue">#1589FF</color>
<color name="cyan">#00FFFF</color>
<color name="gray">#D1D0CE</color>
<color name="lightBlue">#ADD8E6</color>
<color name="list_background">#06ACE4</color>
<color name="list_even">#AAAAAA</color>
<color name="list_header">#99979C</color>
<color name="list_odd">#E1E2E2</color>
<color name="list_selected">#455FB6</color>
<color name="primary">#3f51b5</color>
<color name="primary_dark">#303f9f</color>
<color name="primary_pressed">#E1E2E2</color>
<color name="red">#FF0000</color>
<color name="ripple">#F06292</color>
<color name="text_color">#686868</color>
<color name="white">#FFFFFF</color>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<string name="type_to_search">Type to Search</string>
<style name="DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style>
<style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
<item name="spn_arrowSwitchMode">true</item>
<item name="spn_arrowAnimDuration">@android:integer/config_shortAnimTime</item>
<item name="spn_arrowInterpolator">@android:anim/decelerate_interpolator</item>
</style>
<style name="myDialog" parent="@android:style/Theme.Holo.Light.Dialog">
<item name="android:windowTitleStyle">@style/myDialogTitle</item>
</style>
<style name="myDialogTitle" parent="@android:style/TextAppearance.DialogWindowTitle">
<item name="android:gravity">center_horizontal</item>
</style>
</resources>
File diff suppressed because it is too large Load Diff
@@ -1 +0,0 @@
[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
@@ -1,41 +0,0 @@
-- Merging decision tree log ---
manifest
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
package
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69
application
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19
android:allowBackup
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44
uses-sdk
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml
INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml