lockout-preference
This commit is contained in:
Binary file not shown.
@@ -1995,20 +1995,19 @@ public class Lorealba_Database extends SQLiteOpenHelper {
|
|||||||
values.put("ProductId", tStockSummary.getProductId());
|
values.put("ProductId", tStockSummary.getProductId());
|
||||||
values.put("SaleableIn", tStockSummary.getSaleableIn());
|
values.put("SaleableIn", tStockSummary.getSaleableIn());
|
||||||
values.put("SaleableOut", tStockSummary.getSaleableOut());
|
values.put("SaleableOut", tStockSummary.getSaleableOut());
|
||||||
values.put("SaleableDamage", tStockSummary.getSaleableDamage());
|
values.put("SaleableBalance", tStockSummary.getSaleableStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSaleableBalance()==-1 ? 0 : tStockSummary.getSaleableBalance());
|
||||||
values.put("SaleableBalance", tStockSummary.getSaleableBalance());
|
|
||||||
values.put("TesterIn", tStockSummary.getTesterIn());
|
values.put("TesterIn", tStockSummary.getTesterIn());
|
||||||
values.put("TesterOut", tStockSummary.getTesterOut());
|
values.put("TesterOut", tStockSummary.getTesterOut());
|
||||||
values.put("TesterDamage", tStockSummary.getTesterDamage());
|
values.put("TesterDamage", tStockSummary.getTesterDamage());
|
||||||
values.put("TesterBalance", tStockSummary.getTesterBalance());
|
values.put("TesterBalance", tStockSummary.getTesterStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getTesterBalance()==-1 ? 0 :tStockSummary.getTesterBalance());
|
||||||
values.put("SampleIn", tStockSummary.getSampleIn());
|
values.put("SampleIn", tStockSummary.getSampleIn());
|
||||||
values.put("SampleOut", tStockSummary.getSampleOut());
|
values.put("SampleOut", tStockSummary.getSampleOut());
|
||||||
values.put("SampleDamage", tStockSummary.getSampleDamage());
|
values.put("SampleDamage", tStockSummary.getSampleDamage());
|
||||||
values.put("SampleBalance", tStockSummary.getSampleBalance());
|
values.put("SampleBalance", tStockSummary.getSampleStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSampleBalance()==-1 ? 0 : tStockSummary.getSampleBalance());
|
||||||
values.put("GwpIn", tStockSummary.getGwpIn());
|
values.put("GwpIn", tStockSummary.getGwpIn());
|
||||||
values.put("GwpOut", tStockSummary.getGwpOut());
|
values.put("GwpOut", tStockSummary.getGwpOut());
|
||||||
values.put("GwpDamage", tStockSummary.getGwpDamage());
|
values.put("GwpDamage", tStockSummary.getGwpDamage());
|
||||||
values.put("GwpBalance", tStockSummary.getGwpBalance());
|
values.put("GwpBalance", tStockSummary.getGwpStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getGwpBalance()==-1 ? 0 : tStockSummary.getGwpBalance());
|
||||||
values.put("SaleableStatus", tStockSummary.getSaleableStatus().trim());
|
values.put("SaleableStatus", tStockSummary.getSaleableStatus().trim());
|
||||||
values.put("TesterStatus", tStockSummary.getTesterStatus().trim());
|
values.put("TesterStatus", tStockSummary.getTesterStatus().trim());
|
||||||
values.put("SampleStatus", tStockSummary.getSampleStatus().trim());
|
values.put("SampleStatus", tStockSummary.getSampleStatus().trim());
|
||||||
|
|||||||
@@ -101,12 +101,14 @@ public class AlertandMessages {
|
|||||||
Snackbar.make(Objects.requireNonNull(((Activity) context).getCurrentFocus()), message, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(Objects.requireNonNull(((Activity) context).getCurrentFocus()), message, Snackbar.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void backpressedAlert(final Activity activity) {
|
public static void closeApp(final Activity activity, String str) {
|
||||||
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
|
||||||
builder.setTitle("Alert");
|
builder.setTitle("Alert");
|
||||||
builder.setMessage("Do you want to exit? Filled data will be lost").setCancelable(false)
|
builder.setMessage(str).setCancelable(false)
|
||||||
.setPositiveButton("Ok", (dialog, id) -> activity.finish());
|
.setPositiveButton("Ok", (dialog, id) -> {
|
||||||
builder.setNegativeButton("Cancel", (dialog, which) -> dialog.dismiss());
|
dialog.dismiss();
|
||||||
|
activity.finishAffinity();
|
||||||
|
});
|
||||||
AlertDialog alert = builder.create();
|
AlertDialog alert = builder.create();
|
||||||
alert.show();
|
alert.show();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,6 +117,7 @@ public class CommonString {
|
|||||||
public static final String KEY_TYPE = "Message_Type";
|
public static final String KEY_TYPE = "Message_Type";
|
||||||
public static final int PERMISSION_ALL = 99;
|
public static final int PERMISSION_ALL = 99;
|
||||||
public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA";
|
public static final String TABLE_COVERAGE_DATA = "COVERAGE_DATA";
|
||||||
|
public static final String KEY_LOCKOUT = "LOCKOUT";
|
||||||
public static final String Key_Download_Status = "Download_Status";
|
public static final String Key_Download_Status = "Download_Status";
|
||||||
public static final String MESSAGE_CHANGED = "Invalid UserId Or Password / Password Has Been Changed.";
|
public static final String MESSAGE_CHANGED = "Invalid UserId Or Password / Password Has Been Changed.";
|
||||||
public static final String MESSAGE_LOCKED = "User ID is blocked. Please contact your supervisor";
|
public static final String MESSAGE_LOCKED = "User ID is blocked. Please contact your supervisor";
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
|
|||||||
setSppinerData();
|
setSppinerData();
|
||||||
checkAndRequestPermissions();
|
checkAndRequestPermissions();
|
||||||
getLastLocation();
|
getLastLocation();
|
||||||
|
|
||||||
/* To restrict Space Bar in Keyboard */
|
/* To restrict Space Bar in Keyboard */
|
||||||
InputFilter filter = (source, start, end, dest, dstart, dend) -> {
|
InputFilter filter = (source, start, end, dest, dstart, dend) -> {
|
||||||
for (int i = start; i < end; i++) {
|
for (int i = start; i < end; i++) {
|
||||||
@@ -384,7 +385,9 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
|
|||||||
}
|
}
|
||||||
else if (data != null && data.contains("Lockout")) {
|
else if (data != null && data.contains("Lockout")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOCKED);
|
editor.putBoolean(CommonString.KEY_LOCKOUT + userId + visitdate, true);
|
||||||
|
editor.commit();
|
||||||
|
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
|
||||||
}
|
}
|
||||||
else if (data != null && data.contains("No data")) {
|
else if (data != null && data.contains("No data")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import android.location.LocationManager;
|
|||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.WindowManager;
|
import android.view.WindowManager;
|
||||||
import android.view.inputmethod.InputMethodManager;
|
import android.view.inputmethod.InputMethodManager;
|
||||||
@@ -82,7 +83,6 @@ import retrofit2.converter.gson.GsonConverterFactory;
|
|||||||
public class
|
public class
|
||||||
PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
||||||
private String counterId = "";
|
private String counterId = "";
|
||||||
private final String visitdate = "";
|
|
||||||
private String Update_Visit_Date;
|
private String Update_Visit_Date;
|
||||||
private String userType;
|
private String userType;
|
||||||
Pinview pinview_confirm, pinview_start;
|
Pinview pinview_confirm, pinview_start;
|
||||||
@@ -142,6 +142,9 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
}
|
}
|
||||||
getDeviceName();
|
getDeviceName();
|
||||||
getLastLocation();
|
getLastLocation();
|
||||||
|
if (preferences.getBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, false)) {
|
||||||
|
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean checkAndRequestPermissions() {
|
private boolean checkAndRequestPermissions() {
|
||||||
@@ -543,7 +546,9 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
}
|
}
|
||||||
else if (data_Login.contains("Lockout")) {
|
else if (data_Login.contains("Lockout")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOCKED);
|
editor.putBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, true);
|
||||||
|
editor.commit();
|
||||||
|
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
|
||||||
}
|
}
|
||||||
else if (data_Login.contains("No data")) {
|
else if (data_Login.contains("No data")) {
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
@@ -580,7 +585,6 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
if (!data_login_time.contains("No Data")) {
|
if (!data_login_time.contains("No Data")) {
|
||||||
data_login_Tym = new Gson().fromJson(data_login_time, BADeviceLoginGetterSetter.class);
|
data_login_Tym = new Gson().fromJson(data_login_time, BADeviceLoginGetterSetter.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
loading.dismiss();
|
loading.dismiss();
|
||||||
Gson gson = new Gson();
|
Gson gson = new Gson();
|
||||||
final BADeviceLoginGetterSetter userObject = gson.fromJson(finalData_Login, BADeviceLoginGetterSetter.class);
|
final BADeviceLoginGetterSetter userObject = gson.fromJson(finalData_Login, BADeviceLoginGetterSetter.class);
|
||||||
@@ -593,7 +597,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
|
|||||||
loginGetterSetter = new LoginGetterSetter();
|
loginGetterSetter = new LoginGetterSetter();
|
||||||
loginGetterSetter.setUserId(user_id);
|
loginGetterSetter.setUserId(user_id);
|
||||||
loginGetterSetter.setPassword(allLoginData.get(0).getPassword());
|
loginGetterSetter.setPassword(allLoginData.get(0).getPassword());
|
||||||
loginGetterSetter.setVisitDate(visitdate);
|
loginGetterSetter.setVisitDate(visit_date);
|
||||||
loginGetterSetter.setUserType(userType);
|
loginGetterSetter.setUserType(userType);
|
||||||
if (data_login_Tym != null) {
|
if (data_login_Tym != null) {
|
||||||
loginGetterSetter.setUserLoginTym(data_login_Tym.getLoginTime().get(0).getLoginTime());
|
loginGetterSetter.setUserLoginTym(data_login_Tym.getLoginTime().get(0).getLoginTime());
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<lint-module
|
<lint-module
|
||||||
format="1"
|
format="1"
|
||||||
dir="D:\LorealBa-Latest-MNY-July-2025\library"
|
dir="D:\LorealBa-MNY-Latest-2024\library"
|
||||||
name=":library"
|
name=":library"
|
||||||
type="LIBRARY"
|
type="LIBRARY"
|
||||||
maven="LorealBa-Latest-MNY-July-2025:library:"
|
maven="LorealBa-MNY-Latest-2024:library:"
|
||||||
agpVersion="8.2.2"
|
agpVersion="8.2.2"
|
||||||
buildFolder="build"
|
buildFolder="build"
|
||||||
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:\LorealBa-Latest-MNY-July-2025\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\src\release\jniLibs"/></dataSet></merger>
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\release\jniLibs"/></dataSet></merger>
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:\LorealBa-Latest-MNY-July-2025\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\src\release\shaders"/></dataSet></merger>
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\release\shaders"/></dataSet></merger>
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:\LorealBa-Latest-MNY-July-2025\library\src\main\assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\src\release\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\build\intermediates\shader_assets\release\out"/></dataSet></merger>
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\main\assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\release\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\build\intermediates\shader_assets\release\out"/></dataSet></merger>
|
||||||
+6
-6
@@ -1,6 +1,6 @@
|
|||||||
#Thu Aug 28 16:11:54 IST 2025
|
#Fri Sep 12 13:08:27 IST 2025
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\textview_for_spinner.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\activity_main.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\alert_dialog_listview_search.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_single.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\LorealBa-Latest-MNY-July-2025\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\LorealBa-MNY-Latest-2024\\library\\build\\intermediates\\packaged_res\\release\\layout\\item_listview_multiple.xml
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:\LorealBa-Latest-MNY-July-2025\library\src\main\res"/></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:\LorealBa-Latest-MNY-July-2025\library\src\main\res"><file name="activity_main" path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\LorealBa-Latest-MNY-July-2025\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:\LorealBa-Latest-MNY-July-2025\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:\LorealBa-Latest-MNY-July-2025\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
|
<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:\LorealBa-MNY-Latest-2024\library\src\main\res"/></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:\LorealBa-MNY-Latest-2024\library\src\main\res"><file name="activity_main" path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\LorealBa-MNY-Latest-2024\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:\LorealBa-MNY-Latest-2024\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:\LorealBa-MNY-Latest-2024\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\LorealBa-MNY-Latest-2024\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="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
<item name="spn_labelEnable">true</item>
|
<item name="spn_labelEnable">true</item>
|
||||||
<item name="spn_labelTextSize">18sp</item>
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
@@ -14,9 +14,9 @@
|
|||||||
<item name="android:maxLines">1</item>
|
<item name="android:maxLines">1</item>
|
||||||
<item name="android:scrollHorizontally">true</item>
|
<item name="android:scrollHorizontally">true</item>
|
||||||
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
</style></file><file path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
|
</style></file><file path="D:\LorealBa-MNY-Latest-2024\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
|
||||||
<attr format="string" name="hintText"/>
|
<attr format="string" name="hintText"/>
|
||||||
</declare-styleable></file><file path="D:\LorealBa-Latest-MNY-July-2025\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
|
</declare-styleable></file><file path="D:\LorealBa-MNY-Latest-2024\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="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
|
||||||
<item name="spn_labelEnable">true</item>
|
<item name="spn_labelEnable">true</item>
|
||||||
<item name="spn_labelTextSize">18sp</item>
|
<item name="spn_labelTextSize">18sp</item>
|
||||||
@@ -31,4 +31,4 @@
|
|||||||
<item name="android:maxLines">1</item>
|
<item name="android:maxLines">1</item>
|
||||||
<item name="android:scrollHorizontally">true</item>
|
<item name="android:scrollHorizontally">true</item>
|
||||||
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
|
||||||
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-Latest-MNY-July-2025\library\build\generated\res\resValues\release"/></dataSet><mergedItems/></merger>
|
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\LorealBa-MNY-Latest-2024\library\build\generated\res\resValues\release"/></dataSet><mergedItems/></merger>
|
||||||
+1
-1
@@ -3,5 +3,5 @@
|
|||||||
<compose-theme-adapter versions="0.1.0-dev16,0.1.0-dev17,1.0.0-alpha01,1.0.0-alpha02,1.0.0-alpha03,1.0.0-alpha04,1.0.0-alpha05,1.0.0-alpha06,1.0.0-alpha07,1.0.0-alpha08,1.0.0-alpha09,1.0.0-alpha10,1.0.0-alpha11,1.0.0-alpha12,1.0.0-beta01,1.0.0-beta02,1.0.0-beta03,1.0.0-beta04,1.0.0-beta05,1.0.0-beta06,1.0.0-beta07,1.0.0-beta08,1.0.0-beta09,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.1.0,1.1.1,1.1.2,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8,1.1.9,1.1.10,1.1.11,1.1.12,1.1.13,1.1.14,1.1.15,1.1.16,1.1.17,1.1.18,1.1.19,1.1.20,1.1.21,1.1.22,1.2.0,1.2.1"/>
|
<compose-theme-adapter versions="0.1.0-dev16,0.1.0-dev17,1.0.0-alpha01,1.0.0-alpha02,1.0.0-alpha03,1.0.0-alpha04,1.0.0-alpha05,1.0.0-alpha06,1.0.0-alpha07,1.0.0-alpha08,1.0.0-alpha09,1.0.0-alpha10,1.0.0-alpha11,1.0.0-alpha12,1.0.0-beta01,1.0.0-beta02,1.0.0-beta03,1.0.0-beta04,1.0.0-beta05,1.0.0-beta06,1.0.0-beta07,1.0.0-beta08,1.0.0-beta09,1.0.0-rc01,1.0.0-rc02,1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.1.0,1.1.1,1.1.2,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8,1.1.9,1.1.10,1.1.11,1.1.12,1.1.13,1.1.14,1.1.15,1.1.16,1.1.17,1.1.18,1.1.19,1.1.20,1.1.21,1.1.22,1.2.0,1.2.1"/>
|
||||||
<compose-theme-adapter-3 versions="1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17,1.0.18,1.0.19,1.0.20,1.0.21,1.0.22,1.1.0,1.1.1"/>
|
<compose-theme-adapter-3 versions="1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7,1.0.8,1.0.9,1.0.10,1.0.11,1.0.12,1.0.13,1.0.14,1.0.15,1.0.16,1.0.17,1.0.18,1.0.19,1.0.20,1.0.21,1.0.22,1.1.0,1.1.1"/>
|
||||||
<compose-theme-adapter-core versions="1.0.0,1.0.1"/>
|
<compose-theme-adapter-core versions="1.0.0,1.0.1"/>
|
||||||
<material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03,1.14.0-alpha04"/>
|
<material versions="1.0.0-alpha1,1.0.0-alpha3,1.0.0-beta01,1.0.0-rc01,1.0.0-rc02,1.0.0,1.1.0-alpha01,1.1.0-alpha02,1.1.0-alpha03,1.1.0-alpha04,1.1.0-alpha05,1.1.0-alpha06,1.1.0-alpha07,1.1.0-alpha08,1.1.0-alpha09,1.1.0-alpha10,1.1.0-beta01,1.1.0-beta02,1.1.0-rc01,1.1.0-rc02,1.1.0,1.2.0-alpha01,1.2.0-alpha02,1.2.0-alpha03,1.2.0-alpha04,1.2.0-alpha05,1.2.0-alpha06,1.2.0-beta01,1.2.0-rc01,1.2.0,1.2.1,1.3.0-alpha01,1.3.0-alpha02,1.3.0-alpha03,1.3.0-alpha04,1.3.0-beta01,1.3.0-rc01,1.3.0,1.4.0-alpha01,1.4.0-alpha02,1.4.0-beta01,1.4.0-rc01,1.4.0,1.5.0-alpha01,1.5.0-alpha02,1.5.0-alpha03,1.5.0-alpha04,1.5.0-alpha05,1.5.0-beta01,1.5.0-rc01,1.5.0,1.6.0-alpha01,1.6.0-alpha02,1.6.0-alpha03,1.6.0-beta01,1.6.0-rc01,1.6.0,1.6.1,1.7.0-alpha01,1.7.0-alpha02,1.7.0-alpha03,1.7.0-beta01,1.7.0-rc01,1.7.0,1.8.0-alpha01,1.8.0-alpha02,1.8.0-alpha03,1.8.0-beta01,1.8.0-rc01,1.8.0,1.9.0-alpha01,1.9.0-alpha02,1.9.0-beta01,1.9.0-rc01,1.9.0,1.10.0-alpha01,1.10.0-alpha02,1.10.0-alpha03,1.10.0-alpha04,1.10.0-alpha05,1.10.0-alpha06,1.10.0-beta01,1.10.0-rc01,1.10.0,1.11.0-alpha01,1.11.0-alpha02,1.11.0-alpha03,1.11.0-beta01,1.11.0-rc01,1.11.0,1.12.0-alpha01,1.12.0-alpha02,1.12.0-alpha03,1.12.0-beta01,1.12.0-rc01,1.12.0,1.13.0-alpha01,1.13.0-alpha02,1.13.0-alpha03,1.13.0-alpha04,1.13.0-alpha05,1.13.0-alpha06,1.13.0-alpha07,1.13.0-alpha08,1.13.0-alpha09,1.13.0-alpha10,1.13.0-alpha11,1.13.0-alpha12,1.13.0-alpha13,1.13.0-alpha14,1.13.0-beta01,1.13.0-rc01,1.13.0,1.14.0-alpha01,1.14.0-alpha02,1.14.0-alpha03,1.14.0-alpha04"/>
|
||||||
</com.google.android.material>
|
</com.google.android.material>
|
||||||
|
|||||||
Binary file not shown.
@@ -1,9 +1,9 @@
|
|||||||
<lint-module
|
<lint-module
|
||||||
format="1"
|
format="1"
|
||||||
dir="D:\LorealBa-Latest-MNY-July-2025\library"
|
dir="D:\LorealBa-MNY-Latest-2024\library"
|
||||||
name=":library"
|
name=":library"
|
||||||
type="LIBRARY"
|
type="LIBRARY"
|
||||||
maven="LorealBa-Latest-MNY-July-2025:library:"
|
maven="LorealBa-MNY-Latest-2024:library:"
|
||||||
agpVersion="8.2.2"
|
agpVersion="8.2.2"
|
||||||
buildFolder="build"
|
buildFolder="build"
|
||||||
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
||||||
|
|||||||
+2
-2
@@ -3,7 +3,7 @@
|
|||||||
roots=":@@:library::release,com.github.rey5137:material:1.2.2@aar,androidx.legacy:legacy-support-v4:1.0.0@aar,com.google.android.material:material:1.12.0@aar,androidx.viewpager2:viewpager2:1.0.0@aar,androidx.recyclerview:recyclerview:1.1.0@aar,androidx.constraintlayout:constraintlayout:2.0.1@aar,androidx.appcompat:appcompat:1.6.1@aar,androidx.cardview:cardview:1.0.0@aar,androidx.media:media:1.0.0@aar,androidx.legacy:legacy-support-core-ui:1.0.0@aar,androidx.dynamicanimation:dynamicanimation:1.0.0@aar,androidx.legacy:legacy-support-core-utils:1.0.0@aar,androidx.fragment:fragment:1.3.6@aar,androidx.fragment:fragment:1.3.6@aar,androidx.activity:activity:1.8.0@aar,androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar,androidx.drawerlayout:drawerlayout:1.1.1@aar,androidx.transition:transition:1.5.0@aar,androidx.appcompat:appcompat-resources:1.6.1@aar,androidx.vectordrawable:vectordrawable-animated:1.1.0@aar,androidx.vectordrawable:vectordrawable:1.1.0@aar,androidx.viewpager:viewpager:1.0.0@aar,androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar,androidx.customview:customview:1.1.0@aar,androidx.loader:loader:1.0.0@aar,androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar,androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar,androidx.lifecycle:lifecycle-livedata:2.6.2@aar,androidx.lifecycle:lifecycle-common:2.6.2@jar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar,androidx.lifecycle:lifecycle-runtime:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar,androidx.core:core-ktx:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.versionedparcelable:versionedparcelable:1.1.1@aar,androidx.collection:collection:1.1.0@jar,androidx.cursoradapter:cursoradapter:1.0.0@aar,androidx.savedstate:savedstate:1.2.1@aar,androidx.documentfile:documentfile:1.0.0@aar,androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar,androidx.print:print:1.0.0@aar,androidx.interpolator:interpolator:1.0.0@aar,androidx.arch.core:core-runtime:2.2.0@aar,androidx.arch.core:core-common:2.2.0@jar,androidx.annotation:annotation-jvm:1.6.0@jar,androidx.annotation:annotation-experimental:1.4.0@aar,org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4@jar,org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22@jar,org.jetbrains:annotations:13.0@jar,androidx.resourceinspection:resourceinspection-annotation:1.0.1@jar,androidx.constraintlayout:constraintlayout-solver:2.0.1@jar">
|
roots=":@@:library::release,com.github.rey5137:material:1.2.2@aar,androidx.legacy:legacy-support-v4:1.0.0@aar,com.google.android.material:material:1.12.0@aar,androidx.viewpager2:viewpager2:1.0.0@aar,androidx.recyclerview:recyclerview:1.1.0@aar,androidx.constraintlayout:constraintlayout:2.0.1@aar,androidx.appcompat:appcompat:1.6.1@aar,androidx.cardview:cardview:1.0.0@aar,androidx.media:media:1.0.0@aar,androidx.legacy:legacy-support-core-ui:1.0.0@aar,androidx.dynamicanimation:dynamicanimation:1.0.0@aar,androidx.legacy:legacy-support-core-utils:1.0.0@aar,androidx.fragment:fragment:1.3.6@aar,androidx.fragment:fragment:1.3.6@aar,androidx.activity:activity:1.8.0@aar,androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar,androidx.drawerlayout:drawerlayout:1.1.1@aar,androidx.transition:transition:1.5.0@aar,androidx.appcompat:appcompat-resources:1.6.1@aar,androidx.vectordrawable:vectordrawable-animated:1.1.0@aar,androidx.vectordrawable:vectordrawable:1.1.0@aar,androidx.viewpager:viewpager:1.0.0@aar,androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar,androidx.customview:customview:1.1.0@aar,androidx.loader:loader:1.0.0@aar,androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar,androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar,androidx.lifecycle:lifecycle-livedata:2.6.2@aar,androidx.lifecycle:lifecycle-common:2.6.2@jar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar,androidx.lifecycle:lifecycle-runtime:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar,androidx.core:core-ktx:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.versionedparcelable:versionedparcelable:1.1.1@aar,androidx.collection:collection:1.1.0@jar,androidx.cursoradapter:cursoradapter:1.0.0@aar,androidx.savedstate:savedstate:1.2.1@aar,androidx.documentfile:documentfile:1.0.0@aar,androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar,androidx.print:print:1.0.0@aar,androidx.interpolator:interpolator:1.0.0@aar,androidx.arch.core:core-runtime:2.2.0@aar,androidx.arch.core:core-common:2.2.0@jar,androidx.annotation:annotation-jvm:1.6.0@jar,androidx.annotation:annotation-experimental:1.4.0@aar,org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4@jar,org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22@jar,org.jetbrains:annotations:13.0@jar,androidx.resourceinspection:resourceinspection-annotation:1.0.1@jar,androidx.constraintlayout:constraintlayout-solver:2.0.1@jar">
|
||||||
<dependency
|
<dependency
|
||||||
name=":@@:library::release"
|
name=":@@:library::release"
|
||||||
simpleName="LorealBa-Latest-MNY-July-2025:library"/>
|
simpleName="LorealBa-MNY-Latest-2024:library"/>
|
||||||
<dependency
|
<dependency
|
||||||
name="com.github.rey5137:material:1.2.2@aar"
|
name="com.github.rey5137:material:1.2.2@aar"
|
||||||
simpleName="com.github.rey5137:material"/>
|
simpleName="com.github.rey5137:material"/>
|
||||||
@@ -174,7 +174,7 @@
|
|||||||
roots=":@@:library::release,com.github.rey5137:material:1.2.2@aar,androidx.legacy:legacy-support-v4:1.0.0@aar,com.google.android.material:material:1.12.0@aar,androidx.viewpager2:viewpager2:1.0.0@aar,androidx.recyclerview:recyclerview:1.1.0@aar,androidx.constraintlayout:constraintlayout:2.0.1@aar,androidx.appcompat:appcompat-resources:1.6.1@aar,androidx.appcompat:appcompat:1.6.1@aar,androidx.cardview:cardview:1.0.0@aar,androidx.media:media:1.0.0@aar,androidx.legacy:legacy-support-core-ui:1.0.0@aar,androidx.transition:transition:1.5.0@aar,androidx.dynamicanimation:dynamicanimation:1.0.0@aar,androidx.legacy:legacy-support-core-utils:1.0.0@aar,androidx.fragment:fragment:1.3.6@aar,androidx.fragment:fragment:1.3.6@aar,androidx.activity:activity:1.8.0@aar,androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar,androidx.drawerlayout:drawerlayout:1.1.1@aar,androidx.vectordrawable:vectordrawable-animated:1.1.0@aar,androidx.vectordrawable:vectordrawable:1.1.0@aar,androidx.loader:loader:1.0.0@aar,androidx.viewpager:viewpager:1.0.0@aar,androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar,androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar,androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar,androidx.emoji2:emoji2-views-helper:1.2.0@aar,androidx.emoji2:emoji2:1.2.0@aar,androidx.customview:customview:1.1.0@aar,androidx.savedstate:savedstate:1.2.1@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-process:2.6.2@aar,androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar,androidx.lifecycle:lifecycle-livedata:2.6.2@aar,androidx.lifecycle:lifecycle-common:2.6.2@jar,androidx.lifecycle:lifecycle-runtime:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar,androidx.core:core-ktx:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.core:core:1.13.0@aar,com.google.errorprone:error_prone_annotations:2.15.0@jar,androidx.resourceinspection:resourceinspection-annotation:1.0.1@jar,androidx.documentfile:documentfile:1.0.0@aar,androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar,androidx.print:print:1.0.0@aar,androidx.interpolator:interpolator:1.0.0@aar,androidx.cursoradapter:cursoradapter:1.0.0@aar,androidx.profileinstaller:profileinstaller:1.3.0@aar,androidx.startup:startup-runtime:1.1.1@aar,androidx.tracing:tracing:1.0.0@aar,androidx.versionedparcelable:versionedparcelable:1.1.1@aar,androidx.collection:collection:1.1.0@jar,androidx.concurrent:concurrent-futures:1.1.0@jar,androidx.arch.core:core-runtime:2.2.0@aar,androidx.arch.core:core-common:2.2.0@jar,androidx.annotation:annotation-experimental:1.4.0@aar,androidx.annotation:annotation-jvm:1.6.0@jar,org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4@jar,org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22@jar,androidx.constraintlayout:constraintlayout-solver:2.0.1@jar,org.jetbrains:annotations:13.0@jar,com.google.guava:listenablefuture:1.0@jar">
|
roots=":@@:library::release,com.github.rey5137:material:1.2.2@aar,androidx.legacy:legacy-support-v4:1.0.0@aar,com.google.android.material:material:1.12.0@aar,androidx.viewpager2:viewpager2:1.0.0@aar,androidx.recyclerview:recyclerview:1.1.0@aar,androidx.constraintlayout:constraintlayout:2.0.1@aar,androidx.appcompat:appcompat-resources:1.6.1@aar,androidx.appcompat:appcompat:1.6.1@aar,androidx.cardview:cardview:1.0.0@aar,androidx.media:media:1.0.0@aar,androidx.legacy:legacy-support-core-ui:1.0.0@aar,androidx.transition:transition:1.5.0@aar,androidx.dynamicanimation:dynamicanimation:1.0.0@aar,androidx.legacy:legacy-support-core-utils:1.0.0@aar,androidx.fragment:fragment:1.3.6@aar,androidx.fragment:fragment:1.3.6@aar,androidx.activity:activity:1.8.0@aar,androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar,androidx.drawerlayout:drawerlayout:1.1.1@aar,androidx.vectordrawable:vectordrawable-animated:1.1.0@aar,androidx.vectordrawable:vectordrawable:1.1.0@aar,androidx.loader:loader:1.0.0@aar,androidx.viewpager:viewpager:1.0.0@aar,androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar,androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar,androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar,androidx.emoji2:emoji2-views-helper:1.2.0@aar,androidx.emoji2:emoji2:1.2.0@aar,androidx.customview:customview:1.1.0@aar,androidx.savedstate:savedstate:1.2.1@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar,androidx.lifecycle:lifecycle-process:2.6.2@aar,androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar,androidx.lifecycle:lifecycle-livedata:2.6.2@aar,androidx.lifecycle:lifecycle-common:2.6.2@jar,androidx.lifecycle:lifecycle-runtime:2.6.2@aar,androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar,androidx.core:core-ktx:1.13.0@aar,androidx.core:core:1.13.0@aar,androidx.core:core:1.13.0@aar,com.google.errorprone:error_prone_annotations:2.15.0@jar,androidx.resourceinspection:resourceinspection-annotation:1.0.1@jar,androidx.documentfile:documentfile:1.0.0@aar,androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar,androidx.print:print:1.0.0@aar,androidx.interpolator:interpolator:1.0.0@aar,androidx.cursoradapter:cursoradapter:1.0.0@aar,androidx.profileinstaller:profileinstaller:1.3.0@aar,androidx.startup:startup-runtime:1.1.1@aar,androidx.tracing:tracing:1.0.0@aar,androidx.versionedparcelable:versionedparcelable:1.1.1@aar,androidx.collection:collection:1.1.0@jar,androidx.concurrent:concurrent-futures:1.1.0@jar,androidx.arch.core:core-runtime:2.2.0@aar,androidx.arch.core:core-common:2.2.0@jar,androidx.annotation:annotation-experimental:1.4.0@aar,androidx.annotation:annotation-jvm:1.6.0@jar,org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4@jar,org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib:1.8.22@jar,org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22@jar,androidx.constraintlayout:constraintlayout-solver:2.0.1@jar,org.jetbrains:annotations:13.0@jar,com.google.guava:listenablefuture:1.0@jar">
|
||||||
<dependency
|
<dependency
|
||||||
name=":@@:library::release"
|
name=":@@:library::release"
|
||||||
simpleName="LorealBa-Latest-MNY-July-2025:library"/>
|
simpleName="LorealBa-MNY-Latest-2024:library"/>
|
||||||
<dependency
|
<dependency
|
||||||
name="com.github.rey5137:material:1.2.2@aar"
|
name="com.github.rey5137:material:1.2.2@aar"
|
||||||
simpleName="com.github.rey5137:material"/>
|
simpleName="com.github.rey5137:material"/>
|
||||||
|
|||||||
@@ -689,9 +689,9 @@
|
|||||||
resolved="com.google.guava:listenablefuture:1.0"/>
|
resolved="com.google.guava:listenablefuture:1.0"/>
|
||||||
<library
|
<library
|
||||||
name=":@@:library::release"
|
name=":@@:library::release"
|
||||||
jars="D:\LorealBa-Latest-MNY-July-2025\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out\jars\classes.jar;D:\LorealBa-Latest-MNY-July-2025\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out\jars\libs\R.jar"
|
jars="D:\LorealBa-MNY-Latest-2024\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out\jars\classes.jar;D:\LorealBa-MNY-Latest-2024\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out\jars\libs\R.jar"
|
||||||
resolved="LorealBa-Latest-MNY-July-2025:library:unspecified"
|
resolved="LorealBa-MNY-Latest-2024:library:unspecified"
|
||||||
folder="D:\LorealBa-Latest-MNY-July-2025\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out"
|
folder="D:\LorealBa-MNY-Latest-2024\library\build\.transforms\f6b0a876a140844809a4015960e92ce1\transformed\out"
|
||||||
manifest="AndroidManifest.xml"
|
manifest="AndroidManifest.xml"
|
||||||
resFolder="res"
|
resFolder="res"
|
||||||
assetsFolder="assets"
|
assetsFolder="assets"
|
||||||
|
|||||||
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
mavenArtifactId=library
|
mavenArtifactId=library
|
||||||
mavenGroupId=LorealBa-Latest-MNY-July-2025
|
mavenGroupId=LorealBa-MNY-Latest-2024
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
<lint-module
|
<lint-module
|
||||||
format="1"
|
format="1"
|
||||||
dir="D:\LorealBa-Latest-MNY-July-2025\library"
|
dir="D:\LorealBa-MNY-Latest-2024\library"
|
||||||
name=":library"
|
name=":library"
|
||||||
type="LIBRARY"
|
type="LIBRARY"
|
||||||
maven="LorealBa-Latest-MNY-July-2025:library:"
|
maven="LorealBa-MNY-Latest-2024:library:"
|
||||||
agpVersion="8.2.2"
|
agpVersion="8.2.2"
|
||||||
buildFolder="build"
|
buildFolder="build"
|
||||||
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
bootClassPath="C:\Users\ravik\AppData\Local\Android\Sdk\platforms\android-35\android.jar;C:\Users\ravik\AppData\Local\Android\Sdk\build-tools\34.0.0\core-lambda-stubs.jar"
|
||||||
|
|||||||
+2
-2
@@ -5,8 +5,8 @@
|
|||||||
5 <uses-sdk android:minSdkVersion="24" />
|
5 <uses-sdk android:minSdkVersion="24" />
|
||||||
6
|
6
|
||||||
7 <application android:allowBackup="true" >
|
7 <application android:allowBackup="true" >
|
||||||
7-->D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19
|
7-->D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:5-7:19
|
||||||
7-->D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:18-44
|
7-->D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:18-44
|
||||||
8 </application>
|
8 </application>
|
||||||
9
|
9
|
||||||
10</manifest>
|
10</manifest>
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
-- Merging decision tree log ---
|
-- Merging decision tree log ---
|
||||||
manifest
|
manifest
|
||||||
ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12
|
ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:1-9:12
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:1-9:12
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:1-9:12
|
||||||
package
|
package
|
||||||
ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:3:5-49
|
ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:3:5-49
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml
|
||||||
xmlns:android
|
xmlns:android
|
||||||
ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:2:11-69
|
ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:2:11-69
|
||||||
application
|
application
|
||||||
ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:5-7:19
|
ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:5-7:19
|
||||||
android:allowBackup
|
android:allowBackup
|
||||||
ADDED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml:5:18-44
|
ADDED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml:5:18-44
|
||||||
uses-sdk
|
uses-sdk
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml
|
||||||
android:targetSdkVersion
|
android:targetSdkVersion
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml
|
||||||
android:minSdkVersion
|
android:minSdkVersion
|
||||||
INJECTED from D:\LorealBa-Latest-MNY-July-2025\library\src\main\AndroidManifest.xml
|
INJECTED from D:\LorealBa-MNY-Latest-2024\library\src\main\AndroidManifest.xml
|
||||||
|
|||||||
Reference in New Issue
Block a user