YSY commit
This commit is contained in:
@@ -37,7 +37,7 @@ android {
|
||||
versionName "3.4"*/
|
||||
|
||||
//For SA
|
||||
versionCode 23
|
||||
versionCode 22
|
||||
versionName "3.5"
|
||||
|
||||
|
||||
|
||||
@@ -3561,13 +3561,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
||||
|
||||
}
|
||||
|
||||
public ArrayList<CoverageBean> getPreviousCoverageData(String visitdate) {
|
||||
public ArrayList<CoverageBean> getPreviousCoverageData(String visitdate, String flag_from) {
|
||||
ArrayList<CoverageBean> list = new ArrayList<CoverageBean>();
|
||||
Cursor dbcursor = null;
|
||||
|
||||
try {
|
||||
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
|
||||
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "'", null);
|
||||
|
||||
if (flag_from != null) {
|
||||
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
|
||||
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "' AND " + CommonString.KEY_STORE_FLAG + "='" + flag_from + "'",
|
||||
null);
|
||||
} else {
|
||||
dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where "
|
||||
+ CommonString.KEY_VISIT_DATE + "<>'" + visitdate + "'",
|
||||
null);
|
||||
}
|
||||
|
||||
|
||||
if (dbcursor != null) {
|
||||
dbcursor.moveToFirst();
|
||||
@@ -3594,6 +3603,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
||||
sb.setRemark((((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_COVERAGE_REMARK))))));
|
||||
}
|
||||
|
||||
sb.setCheckOut_Image(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CHECKOUT_IMAGE)));
|
||||
sb.setFlag_from(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_STORE_FLAG)));
|
||||
sb.setSub_reasonId(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_SUB_REASON_ID)));
|
||||
|
||||
list.add(sb);
|
||||
dbcursor.moveToNext();
|
||||
}
|
||||
|
||||
@@ -574,7 +574,9 @@ public class LoginActivity extends AppCompatActivity {
|
||||
editor.putString(CommonString.KEY_VERSION, lgs.getAPP_VERSION());
|
||||
|
||||
editor.putString(CommonString.KEY_PATH, lgs.getAPP_PATH());
|
||||
|
||||
editor.putString(CommonString.KEY_DATE, lgs.getCURRENTDATE());
|
||||
//editor.putString(CommonString.KEY_DATE, "01/25/2019");
|
||||
editor.putString(CommonString.KEY_COUNTRY_ID, lgs.getCOUNTRY_ID());
|
||||
|
||||
editor.commit();
|
||||
|
||||
@@ -493,7 +493,7 @@ public class MainActivity extends AppCompatActivity
|
||||
|
||||
public boolean isPreviousValid(String visit_date) {
|
||||
boolean isvalid = false;
|
||||
ArrayList<CoverageBean> coverage_list = db.getPreviousCoverageData(visit_date);
|
||||
ArrayList<CoverageBean> coverage_list = db.getPreviousCoverageData(visit_date, null);
|
||||
for (int i = 0; i < coverage_list.size(); i++) {
|
||||
StoreBean storeData = db.getSpecificStoreData(coverage_list.get(i).getVisitDate(), coverage_list.get(i).getStoreId(), coverage_list.get(i).getFlag_from());
|
||||
if (storeData.getSTORE_ID() != null) {
|
||||
|
||||
@@ -11,6 +11,7 @@ import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Environment;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.v4.content.FileProvider;
|
||||
@@ -251,13 +252,31 @@ public class AutoUpdateActivity extends AppCompatActivity {
|
||||
dialog.dismiss();
|
||||
|
||||
if (result.equals(CommonString.KEY_SUCCESS)) {
|
||||
Intent i = new Intent(Intent.ACTION_VIEW);
|
||||
/* Intent i = new Intent(Intent.ACTION_VIEW);
|
||||
i.setDataAndType(FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", new File(Environment
|
||||
.getExternalStorageDirectory()
|
||||
+ "/download/"
|
||||
+ "app.apk")),
|
||||
"application/vnd.android.package-archive");
|
||||
startActivity(i);
|
||||
startActivity(i);*/
|
||||
|
||||
File toInstall = new File(Environment.getExternalStorageDirectory()
|
||||
+ "/download/"
|
||||
+ "app.apk");
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
Uri apkUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", toInstall);
|
||||
Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
|
||||
intent.setData(apkUri);
|
||||
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||
startActivity(intent);
|
||||
} else {
|
||||
Uri apkUri = Uri.fromFile(toInstall);
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
AutoUpdateActivity.this.finish();
|
||||
}
|
||||
|
||||
+52
-1
@@ -241,7 +241,43 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
|
||||
protected String doInBackground(Void... params) {
|
||||
try {
|
||||
data = new Data();
|
||||
coverageList = db.getPreviousCoverageData(date);
|
||||
|
||||
ArrayList<CoverageBean> adhoc_coverageList = db.getPreviousCoverageData(date, CommonString.FROM_DEVIATION);
|
||||
|
||||
if (adhoc_coverageList.size() > 0) {
|
||||
|
||||
for (int i = 0; i < adhoc_coverageList.size(); i++) {
|
||||
|
||||
String onXML = "[ADHOC_JCP]"
|
||||
+ "[USER_ID]" + userId + "[/USER_ID]"
|
||||
+ "[VISIT_DATE]" + adhoc_coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
|
||||
+ "[STORE_CD]" + adhoc_coverageList.get(i).getStoreId() + "[/STORE_CD]"
|
||||
+ "[/ADHOC_JCP]";
|
||||
|
||||
final String adhoc_xml = "[DATA]" + onXML + "[/DATA]";
|
||||
|
||||
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
|
||||
request.addProperty("XMLDATA", adhoc_xml);
|
||||
request.addProperty("KEYS", "ADHOC_JOURNEY_PLAN");
|
||||
request.addProperty("USERNAME", userId);
|
||||
request.addProperty("MID", 0);
|
||||
|
||||
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
||||
envelope.dotNet = true;
|
||||
envelope.setOutputSoapObject(request);
|
||||
|
||||
HttpTransportSE 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
coverageList = db.getPreviousCoverageData(date, null);
|
||||
|
||||
if (coverageList.size() > 0) {
|
||||
if (coverageList.size() == 1) {
|
||||
@@ -262,6 +298,19 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
|
||||
|
||||
String camera_allow = storeData.getCAMERA_ALLOW();
|
||||
|
||||
String adhoc;
|
||||
if (coverageList.get(i).getFlag_from()!=null && coverageList.get(i).getFlag_from().equals(CommonString.FROM_DEVIATION)) {
|
||||
adhoc = "1";
|
||||
} else {
|
||||
adhoc = "0";
|
||||
}
|
||||
|
||||
|
||||
String sub_reason_id = coverageList.get(i).getSub_reasonId();
|
||||
if (sub_reason_id!=null && sub_reason_id.equals("")) {
|
||||
sub_reason_id = "0";
|
||||
}
|
||||
|
||||
String onXML = "[DATA]"
|
||||
+ "[USER_DATA]"
|
||||
+ "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]"
|
||||
@@ -278,6 +327,8 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
|
||||
+ "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
|
||||
+ "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
|
||||
+ "[CHECKOUT_IMAGE]" + coverageList.get(i).getCheckOut_Image() + "[/CHECKOUT_IMAGE]"
|
||||
+ "[ADHOC]" + adhoc + "[/ADHOC]"
|
||||
+ "[SUBREASONID]" + sub_reason_id + "[/SUBREASONID]"
|
||||
+ "[/USER_DATA]"
|
||||
+ "[/DATA]";
|
||||
|
||||
|
||||
Binary file not shown.
@@ -1,2 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\debug\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\debug\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:.*:<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\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\debug\assets"/></dataSet></merger>
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
#Fri Jan 18 19:06:33 IST 2019
|
||||
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\item_listview_single.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\debug\\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\\debug\\layout\\item_listview_multiple.xml
|
||||
D\:\\GITHub\\GSKORANGEV2\\library\\src\\main\\res\\layout\\activity_main.xml=D\:\\GITHub\\GSKORANGEV2\\library\\build\\intermediates\\packaged_res\\debug\\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\\debug\\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\\debug\\layout\\textview_for_spinner.xml
|
||||
-25
@@ -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>
|
||||
-47
@@ -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:.*:<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\debug"/><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<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\debug"/><source path="D:\GITHub\GSKORANGEV2\library\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITHub\GSKORANGEV2\library\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Fri Jan 18 19:07:42 IST 2019
|
||||
#Fri Jan 25 09:35:01 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
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -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>
|
||||
-46
@@ -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
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}]
|
||||
Reference in New Issue
Block a user