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

Added BA assessment and fixed baskinGss

Browse Source
This commit is contained in:
jeevanp
2025-12-19 17:10:22 +05:30
parent d2f8f317ae
commit 991846d75a
98 changed files with 1119 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+12 -11
View File
@@ -3,7 +3,6 @@ apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'org.jetbrains.kotlin.android'
android {
namespace("com.cpm.lorealbaautomation")
compileSdk(35)
@@ -12,8 +11,8 @@ android {
applicationId "com.cpm.lorealbaautomation"
//noinspection OldTargetApi
targetSdk 34
versionCode 21
versionName "3.0"
versionCode 23
versionName "3.1"
multiDexEnabled true
useLibrary 'org.apache.http.legacy'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -21,7 +20,6 @@ android {
abiFilters.add("armeabi-v7a")
abiFilters.add("arm64-v8a")
}
}
signingConfigs {
config {
@@ -33,16 +31,17 @@ android {
}
buildTypes {
release {
buildConfigField "boolean", "LOG_ENABLED", "true"
//buildConfigField "boolean", "LOG_ENABLED", "true"
debuggable false
minifyEnabled true
shrinkResources true
minifyEnabled false
shrinkResources false
signingConfig signingConfigs.config
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
firebaseCrashlytics {
mappingFileUploadEnabled false // or false if you want to disable
}
}
// 👇 Add this block to force override
}
@@ -73,12 +72,14 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.4.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
implementation 'org.jetbrains:annotations-java5:15.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
//noinspection GradleDependency
implementation 'com.squareup.retrofit2:retrofit:2.0.2'
//noinspection GradleDependency
implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta1'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.github.bumptech.glide:glide:4.16.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
implementation 'de.hdodenhof:circleimageview:3.1.0'
app/release/LorealBa-LP-T-release.apk → app/release/LOREALBA-LP-T-19DEC025.apk
BIN
View File
Binary file not shown.
app/release/output-metadata.json
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 21,
"versionName": "3.0",
"versionCode": 23,
"versionName": "3.1",
"outputFile": "app-release.apk"
}
],
app/src/main/AndroidManifest.xml
+11 -1
View File
@@ -658,6 +658,14 @@
android:windowSoftInputMode="adjustPan"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".dailyactivity.BaAssessmentActivity"
android:screenOrientation="portrait"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<!-- <meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyAJIqKPhsyYTp6WnM387Fri4nLJo4-mOvc"
@@ -670,16 +678,18 @@
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.file provider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true"
tools:replace="android:authorities">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"
tools:replace="android:resource" />
</provider>
<service
android:name=".service.MyFirebaseMessagingService"
android:exported="false">
app/src/main/java/com/cpm/lorealbaautomation/AutoUpdateActivity.java
+19 -6
View File
@@ -14,6 +14,9 @@ import android.os.Build;
import android.os.Bundle;
import androidx.core.content.FileProvider;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Handler;
import android.os.Looper;
import android.view.Window;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -31,7 +34,6 @@ import java.net.URL;
import java.text.DecimalFormat;
public class AutoUpdateActivity extends AppCompatActivity {
private static final int PERMISSION_ALL = 99;
private Dialog dialog;
private ProgressBar pb;
private TextView percentage, message;
@@ -150,19 +152,30 @@ public class AutoUpdateActivity extends AppCompatActivity {
File toInstall = new File(CommonString.getLorealBaApkFolder(context) + "app.apk");
Uri apkUri;
Intent intent;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
apkUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", toInstall);
intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
intent.setData(apkUri);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
apkUri = FileProvider.getUriForFile(context,
BuildConfig.APPLICATION_ID + ".fileprovider",
toInstall);
intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
context.startActivity(intent);
} else {
apkUri = Uri.fromFile(toInstall);
intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
startActivity(intent);
finish();
// Optional: close the updater activity gracefully
new Handler(Looper.getMainLooper()).postDelayed(() -> {
((Activity) context).finishAffinity();
}, 1000);
}
}
}
app/src/main/java/com/cpm/lorealbaautomation/CounterLoginActivity.java
+1 -1
View File
@@ -502,7 +502,7 @@ public class CounterLoginActivity extends AppCompatActivity implements View.OnCl
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version +"-T");
versioncode_txt.setText("Version : " + version);
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java
+5 -10
View File
@@ -1996,20 +1996,19 @@ public class Lorealba_Database extends SQLiteOpenHelper {
values.put("SaleableIn", tStockSummary.getSaleableIn());
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("SaleableBalance", tStockSummary.getSaleableBalance());
values.put("TesterIn", tStockSummary.getTesterIn());
values.put("TesterOut", tStockSummary.getTesterOut());
values.put("TesterDamage", tStockSummary.getTesterDamage());
values.put("TesterBalance", tStockSummary.getTesterStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getTesterBalance()==-1 ? 0 :tStockSummary.getTesterBalance());
values.put("TesterBalance", tStockSummary.getTesterBalance());
values.put("SampleIn", tStockSummary.getSampleIn());
values.put("SampleOut", tStockSummary.getSampleOut());
values.put("SampleDamage", tStockSummary.getSampleDamage());
values.put("SampleBalance", tStockSummary.getSampleStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSampleBalance()==-1 ? 0 : tStockSummary.getSampleBalance());
values.put("SampleBalance", tStockSummary.getSampleBalance());
values.put("GwpIn", tStockSummary.getGwpIn());
values.put("GwpOut", tStockSummary.getGwpOut());
values.put("GwpDamage", tStockSummary.getGwpDamage());
values.put("GwpBalance", tStockSummary.getGwpStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getGwpBalance()==-1 ? 0 : tStockSummary.getGwpBalance());
values.put("GwpBalance", tStockSummary.getGwpBalance());
values.put("SaleableStatus", tStockSummary.getSaleableStatus().trim());
values.put("TesterStatus", tStockSummary.getTesterStatus().trim());
values.put("SampleStatus", tStockSummary.getSampleStatus().trim());
@@ -3397,8 +3396,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
String table = CommonString.T_StockSummary, additionalQueryMe = " Where SaleableBalance >0", additionalQueryMe2 = "", getData = "(s.SaleableBalance - ifnull(dm.DamageQty,0)) as SaleableBalance";
if (userType != null && userType.equalsIgnoreCase(CommonString.TAG_FROM_ME)) {
additionalQueryMe2 = "UNION ALL Select T1.PRODUCT_ID AS ProductId , SUM(T1.QUANTITY) AS DamageQty FROM SALE_TRACKING_TABLE T1" + " INNER JOIN SALE_TRACKING_HEADER_TABLE T2 ON T2.RECCEPT_COUNT=T1.RECCEPT_COUNT WHERE T2.COUNTER_ID =" + counterId + " AND T2.Visit_Date='" + visit_date + "' AND T1.INVOICE_TYPE='Saleable'" + " AND T1.RIGHTNAME='ME' GROUP BY T1.PRODUCT_ID UNION ALL select S.PROMO_PRODUCT_ID AS ProductId ," + " SUM(S.PROMO_PRODUCT_QTY) AS DamageQty from APPLYED_PROMOTION_TABLE S INNER JOIN SALE_TRACKING_HEADER_TABLE S1 ON S.RECCEPT_COUNT=S1.RECCEPT_COUNT Where S.PROMO_TYPE ='Product'" + " AND S.COUNTER_ID =" + counterId + " AND S1.VISIT_DATE = '" + visit_date + "' AND S.RIGHTNAME='ME' GROUP BY S.PROMO_PRODUCT_ID ";
getData = "((s.SaleableBalance + ifnull(tempsale.TempSale,0) ) - ifnull(dm.DamageQty,0)) as SaleableBalance";
additionalQueryMe = " left join (select ProductId, case when (Select count(*) from (Select CounterId, ProductId," + "sum(TempQty) as TempQty from ( Select T2.COUNTER_ID AS CounterId, T1.PRODUCT_ID AS ProductId , SUM(T1.QUANTITY) AS TempQty FROM SALE_TRACKING_TABLE T1" + " INNER JOIN SALE_TRACKING_HEADER_TABLE T2 ON T2.RECCEPT_COUNT=T1.RECCEPT_COUNT WHERE T2.COUNTER_ID =" + counterId + " AND T2.Visit_Date='" + visit_date + "' AND T1.INVOICE_TYPE='Saleable'" + " AND T1.RIGHTNAME !='ME' GROUP BY T1.PRODUCT_ID" + " UNION ALL select S.COUNTER_ID as CounterId," + " S.PROMO_PRODUCT_ID AS ProductId , SUM(S.PROMO_PRODUCT_QTY) AS TempQty from APPLYED_PROMOTION_TABLE S INNER JOIN SALE_TRACKING_HEADER_TABLE S1" + " ON S.RECCEPT_COUNT=S1.RECCEPT_COUNT Where S.PROMO_TYPE ='Product' AND S.COUNTER_ID =" + counterId + " AND S1.VISIT_DATE = '" + visit_date + "'" + " AND S.RIGHTNAME !='ME' GROUP BY S.PROMO_PRODUCT_ID)as t Group by CounterId, ProductId)" + " c where c.ProductId = t.Productid)>0 then (Select TempQty from (Select CounterId, ProductId," + "sum(TempQty) as TempQty from ( Select T2.COUNTER_ID AS CounterId, T1.PRODUCT_ID AS ProductId , SUM(T1.QUANTITY) AS TempQty FROM SALE_TRACKING_TABLE T1" + " INNER JOIN SALE_TRACKING_HEADER_TABLE T2 ON T2.RECCEPT_COUNT=T1.RECCEPT_COUNT WHERE T2.COUNTER_ID =" + counterId + " AND T2.Visit_Date='" + visit_date + "' AND T1.INVOICE_TYPE='Saleable'" + " AND T1.RIGHTNAME !='ME' AND T2.POS_SALE_FLAG='1' GROUP BY T1.PRODUCT_ID" + " UNION ALL select S.COUNTER_ID as CounterId," + " S.PROMO_PRODUCT_ID AS ProductId , SUM(S.PROMO_PRODUCT_QTY) AS TempQty from APPLYED_PROMOTION_TABLE S INNER JOIN SALE_TRACKING_HEADER_TABLE S1" + " ON S.RECCEPT_COUNT=S1.RECCEPT_COUNT Where S.PROMO_TYPE ='Product' AND S.COUNTER_ID =" + counterId + " AND S1.VISIT_DATE = '" + visit_date + "'" + " AND S.RIGHTNAME !='ME' AND S1.POS_SALE_FLAG ='1' GROUP BY S.PROMO_PRODUCT_ID)as t Group by CounterId, ProductId" + " ) c where c.productId = t.Productid) else (" + "Select sum(QtySold)as QtySold from (select SaleQty as QtySold from Report_BA_TBASale s where s.ProductId = t.ProductId and s.CounterId=" + counterId + " and VisitDate='" + visit_date + "'" + "UNION all select SaleQty as QtySold from Report_BA_TBAPromoSale s where s.ProductId = t.ProductId and s.CounterId=" + counterId + " and VisitDate='" + visit_date + "')" + ") end as TempSale" + " from T_StockSummary t) as tempsale on s.ProductId=tempsale.ProductId";
}
@@ -7898,6 +7895,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
open();
}
long id = db.insert("Master_PromoOffers", null, values);
if (id == -1) {
throw new Exception();
}
@@ -7926,7 +7924,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
sb.setPromoPath(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoPath")));
sb.setPromoOfferTab(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferTab")));
sb.setPromoOfferMobile(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PromoOfferMobile")));
sb.setDescription(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Description")));
sb.setStartDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StartDate")));
sb.setEndDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("EndDate")));
@@ -12590,8 +12587,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
closeDb();
////////test("Database Exception", " while Insert Posm Master Data " + ex.toString());
}
return l2;
}
app/src/main/java/com/cpm/lorealbaautomation/DealarBoardActivity.java
+2 -1
View File
@@ -808,6 +808,7 @@ public class DealarBoardActivity extends AppCompatActivity implements Navigation
}
}
Log.e("finalList", "DealerB"+finalList.toString() );
if (!finalList.isEmpty()) {
Intent intentu = new Intent(context, Downloader.class);
intentu.putExtra(CommonString.KEY_UPLOADIMAGE, "1");
@@ -818,7 +819,7 @@ public class DealarBoardActivity extends AppCompatActivity implements Navigation
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
version_code.setText("Version : " + version +"-T");
version_code.setText("Version : " + version);
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
version_code.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaautomation/IMEILoginActivity.java
+3 -2
View File
@@ -166,7 +166,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version +"-T");
versioncode_txt.setText("Version : " + version);
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
@@ -301,6 +301,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
}
}
String jsonString = jsonObject.toString();
Log.e("jsonString",jsonString);
try {
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout
(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
@@ -318,12 +319,12 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
assert response.body() != null;
data = response.body().string();
data = data.substring(1, data.length() - 1).replace("\\", "");
Log.e("jsonString",data);
Gson gson = new Gson();
final CounterDeviceLoginGetterSetter userObject = gson.fromJson(data, CounterDeviceLoginGetterSetter.class);
if (data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
AlertandMessages.showAlertCounterlogin((Activity) context, CommonString.KEY_FAILURE + " Please try again");
loading.dismiss();
if (loading != null && loading.isShowing()) {
loading.dismiss();
}
app/src/main/java/com/cpm/lorealbaautomation/UserLoginActivity.java
+1 -1
View File
@@ -285,7 +285,7 @@ public class UserLoginActivity extends AppCompatActivity implements View.OnClick
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version +"-T");
versioncode_txt.setText("Version : " + version);
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java
+2
View File
@@ -14,6 +14,8 @@ public class CommonString {
public static final String LorealPromo_Folder = "LorealPromoOffers";
public static final String LorealBaApkFolder = "LorealBaApkFolder";
public static String BA_ASSESSMENT_URL ="https://careaudit.parinaam.in?";
public static String getLorealBaApkFolder(Context context) {
return AppUtils.getInternalDirectory(context, LorealBaApkFolder).getAbsolutePath() + "/";
}
app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerReturnReplaceProductActivity.java
+33 -3
View File
@@ -171,6 +171,7 @@ public class ConsumerReturnReplaceProductActivity extends AppCompatActivity impl
@Override
public void onBackPressed() {
super.onBackPressed();
if (clicked_flag) {
AlertDialog.Builder builder = new AlertDialog.Builder(context).setMessage(CommonString.ONBACK_ALERT_MESSAGE).setCancelable(false).setPositiveButton("Ok",
(dialog, id) -> {
@@ -873,8 +874,38 @@ public class ConsumerReturnReplaceProductActivity extends AppCompatActivity impl
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
}
public void setFilter(int filterType, Spinner dialog_spin) {
List<ProductMaster> filteredList = new ArrayList<>();
switch (filterType) {
case FILTER_FOR_BRAND:
filteredList = filterListForBrand(dialog_product_list, dialog_brand_Id);
break;
case FILTER_FOR_SUB_BRAND:
filteredList = filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id);
break;
case FILTER_FOR_REFERENCE_NAME:
filteredList = filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id);
break;
default:
filteredList = dialog_product_list;
break;
}
// Prepare display strings
List<String> displayList = new ArrayList<>();
displayList.add("- Select Product -"); // default item
for (ProductMaster product : filteredList) {
displayList.add(product.getProductName() + " - (MRP-" + product.getMrp() + ")");
}
// Set adapter
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.addAll(displayList);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
dialog_spin.setAdapter(dialog_sku_adapter);
}
/*public void setFilter(int filterType, Spinner dialog_spin) {
if (filterType == FILTER_FOR_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
@@ -920,9 +951,8 @@ public class ConsumerReturnReplaceProductActivity extends AppCompatActivity impl
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
}
dialog_spin.invalidate();
}
}*/
final int CLEAR_FILTER = 0;
final int FILTER_FOR_BRAND = 1;
app/src/main/java/com/cpm/lorealbaautomation/consumeractivity/ConsumerUserDetailsActivity.java
+70 -6
View File
@@ -16,6 +16,7 @@ import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.graphics.drawable.ColorDrawable;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
@@ -2914,7 +2915,7 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
}
}
public void setFilter(int filterType, Spinner dialog_spin) {
/*public void setFilter(int filterType, Spinner dialog_spin) {
try {
if (filterType == FILTER_FOR_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
@@ -2979,8 +2980,54 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
} catch (Exception e) {
e.fillInStackTrace();
}
}*/
public void setFilter(int filterType, Spinner dialog_spin) {
try {
List<ProductMaster> filteredList = new ArrayList<>();
// Filter once based on type
switch (filterType) {
case FILTER_FOR_BRAND:
filteredList = filterListForBrand(dialog_product_list, dialog_brand_Id);
break;
case FILTER_FOR_SUB_BRAND:
filteredList = filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id);
break;
case FILTER_FOR_REFERENCE_NAME:
filteredList = filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id, dialog_invoiceType);
break;
default:
filteredList = dialog_product_list;
break;
}
// Prepare display strings
List<String> displayList = new ArrayList<>();
displayList.add("- Select Product -"); // default item
boolean isSampleOrGWP = dialog_invoiceType.equalsIgnoreCase("Sample") || dialog_invoiceType.equalsIgnoreCase("GWP");
for (ProductMaster product : filteredList) {
if (isSampleOrGWP) {
displayList.add(product.getProductName() + " - Type-" + dialog_invoiceType);
} else {
displayList.add(product.getProductName() + " - (MRP-" + product.getMrp() + ")");
}
}
// Set adapter efficiently
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.addAll(displayList);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_spin.invalidate();
} catch (Exception e) {
e.printStackTrace();
}
}
final int CLEAR_FILTER = 0;
final int FILTER_FOR_BRAND = 1;
final int FILTER_FOR_SUB_BRAND = 2;
@@ -4282,8 +4329,18 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
protected void remove_added_promo_index() {
try {
if (!selected_list.isEmpty()) {
// Do something
selected_list.removeIf(InvoiceGetterSetter::isPromo_flag);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // API 24+
selected_list.removeIf(InvoiceGetterSetter::isPromo_flag);
} else {
// Fallback for SDK 23 and below
Iterator<InvoiceGetterSetter> iterator = selected_list.iterator();
while (iterator.hasNext()) {
InvoiceGetterSetter item = iterator.next();
if (item.isPromo_flag()) {
iterator.remove();
}
}
}
}
} catch (Exception e) {
e.fillInStackTrace();
@@ -4292,9 +4349,16 @@ public class ConsumerUserDetailsActivity extends AppCompatActivity implements Vi
protected void remove_added_promo_fromtemp(String promoId) {
try {
if (!added_prmo_products.isEmpty()) {
// Do something
added_prmo_products.removeIf(name -> promoId.equals(name.getPromotion_Id()));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
added_prmo_products.removeIf(item -> promoId.equals(item.getPromotion_Id()));
} else {
Iterator<InvoiceGetterSetter> iterator = added_prmo_products.iterator();
while (iterator.hasNext()) {
InvoiceGetterSetter item = iterator.next();
if (promoId.equals(item.getPromotion_Id())) {
iterator.remove();
}
}
}
} catch (Exception e) {
e.fillInStackTrace();
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BAProfileActivity.java
-3
View File
@@ -216,7 +216,6 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
if (file != null) {
for (File value : file) arrayFiles.add(value.getName());
}
return arrayFiles;
}
@@ -239,7 +238,6 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
}
}
void getQuizProfileData() {
hashMapAnsListChildData = new HashMap<>();
childListData = new ArrayList<>();
@@ -359,7 +357,6 @@ public class BAProfileActivity extends AppCompatActivity implements View.OnClick
}
}
});
expandableListView.clearFocus();
}
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/BaAssessmentActivity.java
+157
View File
@@ -0,0 +1,157 @@
package com.cpm.lorealbaautomation.dailyactivity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.cpm.lorealbaautomation.Database.Lorealba_Database;
import com.cpm.lorealbaautomation.R;
import com.cpm.lorealbaautomation.constant.AlertandMessages;
import com.cpm.lorealbaautomation.constant.CommonFunctions;
import com.cpm.lorealbaautomation.constant.CommonString;
import com.cpm.lorealbaautomation.delegates.PrefHelper;
import com.cpm.lorealbaautomation.gsonGetterSetter.JourneyPlan;
import com.cpm.lorealbaautomation.gsonGetterSetter.MasterSurvey;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import im.delight.android.webview.AdvancedWebView;
public class BaAssessmentActivity extends AppCompatActivity {
private final Handler loaderHandler = new Handler(Looper.getMainLooper());
private String username;
private String couter_code;
private Lorealba_Database db;
JourneyPlan jcp_Object = new JourneyPlan();
AdvancedWebView webView;
ProgressBar progressBar;
private Runnable showLoaderRunnable;
private boolean pageLoaded = false;
@SuppressLint("MissingInflatedId")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_ba_assessment);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
webView = (AdvancedWebView) findViewById(R.id.webviewbaAssessment);
SharedPreferences preferences = PrefHelper.getPrefs(this);
String date = preferences.getString(CommonString.KEY_DATE, "");
username = preferences.getString(CommonString.KEY_USERNAME, "");
String counter_id = preferences.getString(CommonString.KEY_COUNTER_ID, "");
couter_code = preferences.getString(CommonString.KEY_COUNTER_CODE, "");
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
if (!CommonFunctions.isTablet(this)) {
toolbar.setTitleTextAppearance(this, R.style.changestext_sizefor_mobile);
}
Objects.requireNonNull(getSupportActionBar()).setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
db = new Lorealba_Database(this);
db.open();
jcp_Object = db.getBIDfromJCP(username, counter_id);
setTitle("BA Assessment - " + date);
if (CommonFunctions.checkNetIsAvailable(this)) {
loadWeb();
} else {
AlertandMessages.showToastMsg(this, getString(R.string.nonetwork));
}
}
@Override
protected void onResume() {
super.onResume();
db.open();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == android.R.id.home) {
onBackPressed();
}
return super.onOptionsItemSelected(item);
}
@Override
public void onBackPressed() {
if (webView.canGoBack()) {
webView.goBack();
} else {
super.onBackPressed();
this.finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
}
@SuppressLint("SetJavaScriptEnabled")
private void loadWeb() {
WebSettings webSettings = webView.getSettings();
webSettings.setJavaScriptEnabled(true);
webSettings.setDomStorageEnabled(true);
webSettings.setLoadWithOverviewMode(true);
webSettings.setUseWideViewPort(true);
webSettings.setSupportZoom(true);
webSettings.setBuiltInZoomControls(true);
webSettings.setDisplayZoomControls(false);
// Android 5+ mixed content
webSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
webView.loadUrl(CommonString.BA_ASSESSMENT_URL + "c=" + couter_code + "&u=" + username);
webView.setWebViewClient(new WebViewClient() {
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
pageLoaded = false;
showLoaderRunnable = () -> {
if (!pageLoaded) {
progressBar.setVisibility(View.VISIBLE);
}
};
// ⏳ Wait 400ms before showing loader
loaderHandler.postDelayed(showLoaderRunnable, 4000);
}
@Override
public void onPageFinished(WebView view, String url) {
pageLoaded = true;
loaderHandler.removeCallbacks(showLoaderRunnable);
progressBar.setVisibility(View.GONE);
}
});
}
}
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/ConsumerReturnActivity.java
+29 -11
View File
@@ -784,17 +784,42 @@ public class ConsumerReturnActivity extends AppCompatActivity implements View.On
public void setFilter(int filterType, Spinner dialog_spin) {
List<ProductMaster> filteredList = new ArrayList<>();
switch (filterType) {
case FILTER_FOR_BRAND:
filteredList = filterListForBrand(dialog_product_list, dialog_brand_Id);
break;
case FILTER_FOR_SUB_BRAND:
filteredList = filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id);
break;
case FILTER_FOR_REFERENCE_NAME:
filteredList = filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id);
break;
default:
filteredList = dialog_product_list;
break;
}
// Prepare display strings
List<String> displayList = new ArrayList<>();
displayList.add("- Select Product -"); // default item
for (ProductMaster product : filteredList) {
displayList.add(product.getProductName() + " - (MRP-" + product.getMrp() + ")");
}
// Set adapter
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.addAll(displayList);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
dialog_spin.setAdapter(dialog_sku_adapter);
}
/*public void setFilter(int filterType, Spinner dialog_spin) {
if (filterType == FILTER_FOR_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < filterListForBrand(dialog_product_list, dialog_brand_Id).size(); i++) {
dialog_sku_adapter.add(filterListForBrand(dialog_product_list, dialog_brand_Id).get(i).getProductName() + " - (MRP-" + filterListForBrand(dialog_product_list, dialog_brand_Id).get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else if (filterType == FILTER_FOR_SUB_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
@@ -805,31 +830,24 @@ public class ConsumerReturnActivity extends AppCompatActivity implements View.On
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else if (filterType == FILTER_FOR_REFERENCE_NAME) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).size(); i++) {
dialog_sku_adapter.add(filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).get(i).getProductName() + " - (MRP-" + filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < dialog_product_list.size(); i++) {
dialog_sku_adapter.add(dialog_product_list.get(i).getProductName() + " - (MRP-" + dialog_product_list.get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
}
dialog_spin.invalidate();
}
}*/
final int CLEAR_FILTER = 0;
final int FILTER_FOR_BRAND = 1;
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/ManualInWardStockActivity.java
+29 -44
View File
@@ -763,12 +763,14 @@ public class ManualInWardStockActivity extends AppCompatActivity implements View
flag_filter_by_edt = false;
try {
dialog_brand_Id = adapterView.getSelectedItem().toString();
Log.d("spinner_error", dialog_brand_Id);
setFilter(FILTER_FOR_BRAND, dialog_product_spin);
setSubBrandSpinnerData(db.getsub_brand_using_brand_Id(dialog_brand_Id, "SubBrandName", "SubBrandId",
"BrandName", null, visit_date, counter_id, false, null), dialog_sub_brand_spin);
setReferenceSpinnerData(db.getsub_brand_using_brand_Id(dialog_brand_Id, "ReferenceName", "ReferenceId",
"BrandName", null, visit_date, counter_id, false, null), dialog_franchise_spin);
} catch (Exception e) {
Log.d("spinner_ex", e.getMessage());
throw new RuntimeException(e);
}
} else {
@@ -936,53 +938,36 @@ public class ManualInWardStockActivity extends AppCompatActivity implements View
public void setFilter(int filterType, Spinner dialog_spin) {
if (filterType == FILTER_FOR_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
List<ProductMaster> filteredList = new ArrayList<>();
for (int i = 0; i < filterListForBrand(dialog_product_list, dialog_brand_Id).size(); i++) {
dialog_sku_adapter.add(filterListForBrand(dialog_product_list, dialog_brand_Id).get(i).getProductName() + " - (MRP-" + filterListForBrand(dialog_product_list, dialog_brand_Id).get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else if (filterType == FILTER_FOR_SUB_BRAND) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id).size(); i++) {
dialog_sku_adapter.add(filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id).get(i).getProductName() + " - (MRP-" +
filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id).get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else if (filterType == FILTER_FOR_REFERENCE_NAME) {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).size(); i++) {
dialog_sku_adapter.add(filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).get(i).getProductName() +
" - (MRP-" + filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id).get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
} else {
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.add("- Select Product -");
for (int i = 0; i < dialog_product_list.size(); i++) {
dialog_sku_adapter.add(dialog_product_list.get(i).getProductName() + " - (MRP-" + dialog_product_list.get(i).getMrp().toString() + ")");
}
dialog_spin.setAdapter(dialog_sku_adapter);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
// Filter only once based on type
switch (filterType) {
case FILTER_FOR_BRAND:
filteredList = filterListForBrand(dialog_product_list, dialog_brand_Id);
break;
case FILTER_FOR_SUB_BRAND:
filteredList = filterListForSubBrand(dialog_product_list, dialog_sub_brand_Id, dialog_brand_Id);
break;
case FILTER_FOR_REFERENCE_NAME:
filteredList = filterListForReferencename(dialog_product_list, dialog_reference_Id, dialog_brand_Id, dialog_sub_brand_Id);
break;
default:
filteredList = dialog_product_list;
break;
}
dialog_spin.invalidate();
// Prepare display strings
List<String> displayList = new ArrayList<>();
displayList.add("- Select Product -"); // default item
for (ProductMaster product : filteredList) {
displayList.add(product.getProductName() + " - (MRP-" + product.getMrp() + ")");
}
// Set adapter
dialog_sku_adapter = new ArrayAdapter<>(context, R.layout.spinner_custom_item);
dialog_sku_adapter.addAll(displayList);
dialog_sku_adapter.setDropDownViewResource(R.layout.spinner_custom_item);
dialog_spin.setAdapter(dialog_sku_adapter);
}
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/SkinGeniusScreenshotActivity.java
+49 -68
View File
@@ -8,6 +8,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
@@ -145,7 +146,6 @@ public class SkinGeniusScreenshotActivity extends AppCompatActivity implements V
@SuppressLint("NonConstantResourceId")
@Override
public void onClick(View v) {
if (v.getId() == R.id.img_cam_selfie) {
browseDocuments();
} else if (v.getId() == R.id.save_skin_genius) {
@@ -182,82 +182,63 @@ public class SkinGeniusScreenshotActivity extends AppCompatActivity implements V
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
}
private void browseDocuments() {
String[] mimeTypes =
{"application/msword", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"image/jpeg",
"image/jpg", "image/png"};
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.setType("*/*");
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
startActivityForResult(Intent.createChooser(intent, "Choose Skin Genius Screenshot"), FILE_PICKER_CODE);
intent.setType("image/*");
intent.addCategory(Intent.CATEGORY_OPENABLE);
startActivityForResult(
Intent.createChooser(intent, "Choose Skin Genius Screenshot"),
FILE_PICKER_CODE
);
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
// TODO Auto-generated method stub
if (resultCode == Activity.RESULT_OK) {
if (requestCode == FILE_PICKER_CODE) {
Uri uri = data.getData();
assert uri != null;
String uriString = uri.toString();
String displayName = null;
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (uriString.startsWith("content://")) {
try (Cursor cursor = getContentResolver().query(uri, null, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) {
displayName = CounterId + username.replace(".", "") + "-SkinGenius-" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
}
}
} else if (uriString.startsWith("file://")) {
displayName = CounterId + username.replace(".", "") + "-SkinGenius-" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
if (requestCode == FILE_PICKER_CODE && resultCode == Activity.RESULT_OK) {
Uri uri = data.getData();
if (uri == null) return;
String displayName =
CounterId +
username.replace(".", "") +
"-SkinGenius-" +
visit_date.replace("/", "") + "_" +
getCurrentTime().replace(":", "") +
".jpg";
File targetFile = new File(CommonString.getImagesFolder(this), displayName);
try (
InputStream inputStream = getContentResolver().openInputStream(uri);
OutputStream outputStream = new FileOutputStream(targetFile)
) {
byte[] buffer = new byte[8192];
int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, bytesRead);
}
try {
File sourceLocation = null;
sourceLocation = FileUtils.getFile(context, uri);
File targetLocation = new File(CommonString.getImagesFolder(context) + displayName);
if (sourceLocation != null) {
InputStream in = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
in = Files.newInputStream(sourceLocation.toPath());
} else {
in = new FileInputStream(sourceLocation);
}
OutputStream out = null;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
out = Files.newOutputStream(targetLocation.toPath());
} else out = new FileOutputStream(targetLocation);
// Copy the bits from instream to outstream
byte[] buf = new byte[1024];
int len;
while ((len = in.read(buf)) > 0) {
out.write(buf, 0, len);
}
in.close();
out.close();
img_str = displayName;
if (new File(CommonString.getImagesFolder(context) + img_str).exists()) {
try {
Bitmap bmp = convertBitmap(CommonString.getImagesFolder(context) + img_str);
img_cam.setImageBitmap(bmp);
} catch (OutOfMemoryError ex) {
CommonFunctions.setScaledImage(img_cam, CommonString.getImagesFolder(context) + img_str);
}
img_clicked.setVisibility(View.GONE);
img_cam.setVisibility(View.VISIBLE);
}
} else {
AlertandMessages.showToastMsg(context, "Unable to retrieve the path. Please try again");
}
} catch (IOException e) {
e.fillInStackTrace();
img_str = displayName;
if (targetFile.exists()) {
BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = 2; // prevent OOM
Bitmap bitmap = BitmapFactory.decodeFile(
targetFile.getAbsolutePath(), options
);
img_cam.setImageBitmap(bitmap);
img_clicked.setVisibility(View.GONE);
img_cam.setVisibility(View.VISIBLE);
}
} catch (Exception e) {
e.fillInStackTrace();
AlertandMessages.showToastMsg(this, "Image load failed");
}
}
super.onActivityResult(requestCode, resultCode, data);
}
}
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java
+1 -8
View File
@@ -258,7 +258,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version+"-T");
versioncode_txt.setText("Version : " + version);
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
@@ -459,7 +459,6 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
dialogInterface.dismiss();
finish();
});
builder.show();
} else {
Intent in = new Intent(getApplicationContext(), PinViewActivity.class);
@@ -478,7 +477,6 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
finish();
loading.dismiss();
}
}
} catch (Exception e) {
e.fillInStackTrace();
@@ -490,20 +488,17 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_NO_RESPONSE_SERVER);
}
}
@Override
public void onFailure(@NonNull Call<String> call, @NonNull Throwable t) {
loading.dismiss();
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_SOCKETEXCEPTION);
}
});
}
} catch (Exception e) {
loading.dismiss();
e.fillInStackTrace();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_SOCKETEXCEPTION + "(" + e.toString() + ")");
}
} else {
loading.dismiss();
@@ -527,11 +522,9 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
e.fillInStackTrace();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_SOCKETEXCEPTION + "(" + e + ")");
}
} catch (PackageManager.NameNotFoundException | JSONException e) {
loading.dismiss();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_SOCKETEXCEPTION + "(" + e + ")");
}
}
app/src/main/java/com/cpm/lorealbaautomation/download/Downloader.java
+6 -5
View File
@@ -280,6 +280,7 @@ public class Downloader extends JobIntentService {
}
storeDetail.put(jsonObject);
}
Log.d("uploadProfiledata",storeDetail.toString());
JSONObject jsonFinalObject = new JSONObject();
jsonFinalObject.put("MID", mid);
jsonFinalObject.put("Keys", "BaProfileData");
@@ -664,7 +665,7 @@ public class Downloader extends JobIntentService {
}
}
}
Log.e("finalList", "Downloader"+finalList.toString());
if (!finalList.isEmpty()) {
filename = "";
for (int i = 0; i < finalList.size(); i++) {
@@ -708,10 +709,8 @@ public class Downloader extends JobIntentService {
} else {
foldername = "BulkUpload";
}
filename = finalList.get(i);
}
break;
}
@@ -759,8 +758,10 @@ public class Downloader extends JobIntentService {
UploadImageRecursive();
}
} catch (Exception e) {
Log.e("finalList", "Downloader"+e.toString());
e.fillInStackTrace();
} catch (OutOfMemoryError error) {
Log.e("finalList", "Downloader"+error.toString());
statusforimage[0] = -1;
error.fillInStackTrace();
}
@@ -768,15 +769,15 @@ public class Downloader extends JobIntentService {
@Override
public void onFailure(Throwable t) {
Log.e("finalList", "Downloader"+t.toString());
if (t instanceof IOException || t instanceof SocketTimeoutException || t instanceof SocketException) {
statusforimage[0] = -1;
}
}
});
}
} catch (JsonSyntaxException e) {
e.fillInStackTrace();
} catch (Exception e) {
Log.e("finalList", "Downloader"+e.toString());
e.fillInStackTrace();
}
}
app/src/main/java/com/cpm/lorealbaautomation/fragements/BAdvisorMenuFragment.java
+11 -8
View File
@@ -8,7 +8,6 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -73,9 +72,8 @@ public class BAdvisorMenuFragment extends Fragment {
user_type = preferences.getString(CommonString.KEY_USER_TYPE, "");
((DealarBoardActivity) requireActivity()).setBaMenuRefreshListener(value -> {
// Set the adapter
if (view instanceof RecyclerView) {
if (view instanceof RecyclerView recyclerView) {
Context context = view.getContext();
RecyclerView recyclerView = (RecyclerView) view;
recyclerView.setAdapter(new MyAdaperForIcon(context, getdata(value), value));
recyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
}
@@ -86,7 +84,7 @@ public class BAdvisorMenuFragment extends Fragment {
public List<NavMenuItemGetterSetter> getdata(String value) {
List<NavMenuItemGetterSetter> data = new ArrayList<>();
int groomed_img = 0, consumer_interaction = 0, consumer_return = 0, break_mangment = 0, ba_training = 0, leave_mangment = 0, ba_survey = 0, ba_skin_genius = 0;
int groomed_img = 0, consumer_interaction = 0, consumer_return = 0, break_mangment = 0, ba_training = 0, leave_mangment = 0, ba_survey = 0,ba_assessment=0, ba_skin_genius = 0;
db.open();
String saleable_status = db.getStatus(CommonString.KEY_SaleableStatus, counterId);
if (value.equals("1")) {
@@ -99,6 +97,7 @@ public class BAdvisorMenuFragment extends Fragment {
leave_mangment = R.mipmap.leave_m_grey;
}
ba_survey = R.mipmap.ba_survey;
ba_assessment = R.mipmap.ba_assessment;
ba_skin_genius = R.mipmap.vto_grey;
} else if (value.equals("2")) {
@@ -111,6 +110,7 @@ public class BAdvisorMenuFragment extends Fragment {
}
ba_training = R.mipmap.training;
ba_survey = R.mipmap.ba_survey;
ba_assessment = R.mipmap.ba_assessment;
ba_skin_genius = R.mipmap.vto_grey;
} else {
db.open();
@@ -132,6 +132,7 @@ public class BAdvisorMenuFragment extends Fragment {
leave_mangment = R.mipmap.leave_management;
}
ba_survey = R.mipmap.ba_survey;
ba_assessment = R.mipmap.ba_assessment;
}
@@ -152,6 +153,7 @@ public class BAdvisorMenuFragment extends Fragment {
leave_mangment = R.mipmap.leave_management;
}
ba_survey = R.mipmap.ba_survey;
ba_assessment = R.mipmap.ba_assessment;
} else {
if (complete) {
@@ -171,15 +173,16 @@ public class BAdvisorMenuFragment extends Fragment {
leave_mangment = R.mipmap.leave_management;
}
ba_survey = R.mipmap.ba_survey;
ba_assessment = R.mipmap.ba_assessment;
}
}
int[] img = {groomed_img, consumer_interaction, consumer_return, break_mangment, ba_training, ba_survey, ba_skin_genius};
String[] name = {"Grooming Image", "Consumer Interaction", "Consumer Return", "Break Management", "Training", "BA Survey", "VTO"};
int[] img = {groomed_img, consumer_interaction, consumer_return, break_mangment, ba_training, ba_survey,ba_assessment, ba_skin_genius};
String[] name = {"Grooming Image", "Consumer Interaction", "Consumer Return", "Break Management", "Training", "BA Survey","BA Assessment", "VTO"};
if (user_type != null && user_type.equalsIgnoreCase(CommonString.TAG_FROM_BA)) {
name = new String[]{"Grooming Image", "Consumer Interaction", "Consumer Return", "Break Management", "Leave Management", "Training", "BA Survey", "VTO"};
img = new int[]{groomed_img, consumer_interaction, consumer_return, break_mangment, leave_mangment, ba_training, ba_survey, ba_skin_genius};
name = new String[]{"Grooming Image", "Consumer Interaction", "Consumer Return", "Break Management", "Leave Management", "Training", "BA Survey", "BA Assessment","VTO"};
img = new int[]{groomed_img, consumer_interaction, consumer_return, break_mangment, leave_mangment, ba_training, ba_survey,ba_assessment, ba_skin_genius};
}
for (int i = 0; i < img.length; i++) {
NavMenuItemGetterSetter recData = new NavMenuItemGetterSetter();
app/src/main/java/com/cpm/lorealbaautomation/fragements/MyAdaperForIcon.java
+3
View File
@@ -21,6 +21,7 @@ import com.cpm.lorealbaautomation.constant.AlertandMessages;
import com.cpm.lorealbaautomation.constant.CommonString;
import com.cpm.lorealbaautomation.consumeractivity.ConsumerIntractionDetailActivity;
import com.cpm.lorealbaautomation.dailyactivity.BASurveyListActivity;
import com.cpm.lorealbaautomation.dailyactivity.BaAssessmentActivity;
import com.cpm.lorealbaautomation.dailyactivity.ConsumerReturnActivity;
import com.cpm.lorealbaautomation.dailyactivity.CounterImageActivity;
import com.cpm.lorealbaautomation.dailyactivity.CounterProfileActivity;
@@ -178,6 +179,8 @@ public class MyAdaperForIcon extends RecyclerView.Adapter<MyAdaperForIcon.ViewHo
db.deleteBASurveyData(counter_id, visit_date);
}
context.startActivity(new Intent(context, BASurveyListActivity.class).putExtra("SurveyType", "BA"));
} else if (current.getIconImg() == R.mipmap.ba_assessment) {
context.startActivity(new Intent(context, BaAssessmentActivity.class));
} else if (current.getIconImg() == R.mipmap.survey) {
db.open();
JourneyPlan jcp_Object = db.getBIDfromJCP(username, counter_id);
app/src/main/java/com/cpm/lorealbaautomation/password/MPinActivity.java
-13
View File
@@ -99,16 +99,7 @@ public class MPinActivity extends AppCompatActivity implements
blurLockView.setTypeface(getTypeface());
blurLockView.setOnLeftButtonClickListener(this);
blurLockView.setOnPasswordInputListener(this);
//blurLockView.setType(getPasswordType(), false);
//blurLockView.setPasswordLength(4);
/* blurLockView.show(
getIntent().getIntExtra("SHOW_DURATION", 1000),
getShowType(getIntent().getIntExtra("SHOW_DIRECTION", 0)),
getEaseType(getIntent().getIntExtra("SHOW_EASE_TYPE", 30)));*/
blurLockView.setType(Password.NUMBER, true);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
@@ -171,10 +162,6 @@ public class MPinActivity extends AppCompatActivity implements
int incorrect_times = blurLockView.getIncorrectInputTimes();
if (++incorrect_times >= 3) {
/*Toast.makeText(this,
R.string.error_incorrect_password,
Toast.LENGTH_SHORT).show();*/
Snackbar snackbar = Snackbar.make(blurLockView, "Incorrect MPin limit reached", Snackbar.LENGTH_INDEFINITE);
View view = snackbar.getView();
/*TextView tv = (TextView)view.findViewById(android.support.design.R.id.snackbar_text);
app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java
+1 -1
View File
@@ -491,7 +491,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
JSONObject jsonObject = new JSONObject();
jsonObject.put("UserName", user_id);
jsonObject.put("Password", allLoginData.get(0).getPassword());
jsonObject.put("Password", allLoginData.get(0).getPassword().trim());
jsonObject.put("CounterId", counterId);
jsonObject.put("Latitude", lat);
jsonObject.put("Longitude", lon);
app/src/main/java/com/cpm/lorealbaautomation/reports/ReportDayWiseActivity.java
-1
View File
@@ -355,7 +355,6 @@ public class ReportDayWiseActivity extends AppCompatActivity {
if (loading != null && loading.isShowing()) {
loading.dismiss();
}
call_adapter(context);
} else if (!data.contains("No Data")) {
if (loading != null && loading.isShowing()) {
app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java
+1
View File
@@ -886,6 +886,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
break;
case "Master_PromoOffers":
Log.e("Master_PromoOffers",data);
if (!data.contains("No Data")) {
masterPromoOfferObject = new Gson().fromJson(data, MasterBAProfileGetterSetter.class);
db.open();
app/src/main/java/com/cpm/lorealbaautomation/retrofit/RetrofitMethod.java
-46
View File
@@ -74,52 +74,6 @@ public class RetrofitMethod {
pd.setMessage("Uploading images");
pd.show();
}
public void UploadBackup(final String filename, String foldername, String folderPath) {
try {
status = 0;
final File finalFile = new File(folderPath + filename);
isvalid = false;
adapter = new Retrofit.Builder()
.baseUrl(CommonString.URL)
.addConverterFactory(new StringConverterFactory())
.build();
PostApi api = adapter.create(PostApi.class);
Call<String> call = api.getUploadDataBaseBackup(body1);
call.enqueue(new Callback<String>() {
@Override
public void onResponse(Response<String> response) {
if (response.isSuccess() && response.body().contains("Success")) {
finalFile.delete();
pd.dismiss();
AlertandMessages.showToastMsg(context, context.getString(R.string.data_uploaded_successfully));
} else {
pd.dismiss();
AlertandMessages.showAlert((Activity) context, context.getString(R.string.database_not_uploaded), true);
}
}
@Override
public void onFailure(Throwable t) {
if (t instanceof IOException || t instanceof SocketTimeoutException || t instanceof SocketException) {
pd.dismiss();
AlertandMessages.showAlert((Activity) context, CommonString.MESSAGE_SOCKETEXCEPTION, true);
} else {
pd.dismiss();
AlertandMessages.showAlert((Activity) context, context.getString(R.string.errordatabase_not_uploaded), true);
}
}
});
} catch (Exception e) {
e.fillInStackTrace();
pd.dismiss();
AlertandMessages.showAlert((Activity) context, CommonString.MESSAGE_EXCEPTION, true);
}
}
String getParsedDate(String filename) {
String testfilename = filename;
testfilename = testfilename.substring(testfilename.indexOf("-") + 1);
app/src/main/java/com/cpm/lorealbaautomation/retrofit/StringConverterFactory.java
+2 -9
View File
@@ -1,13 +1,10 @@
package com.cpm.lorealbaautomation.retrofit;
import com.squareup.okhttp.MediaType;
import com.squareup.okhttp.RequestBody;
import com.squareup.okhttp.ResponseBody;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;
import retrofit.Converter;
/**
@@ -41,11 +38,7 @@ class StringConverter implements Converter<String> {
}
private static byte[] convertToBytes(String string) {
try {
return string.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
return string.getBytes(StandardCharsets.UTF_8);
}
}
app/src/main/java/com/cpm/lorealbaautomation/timer/TimerActivity.java
+11 -12
View File
@@ -1,5 +1,6 @@
package com.cpm.lorealbaautomation.timer;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -47,10 +48,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class TimerActivity extends AppCompatActivity {
String process_data_Status = "", visit_date, username, counter_id;
SharedPreferences preferences = null;
SharedPreferences.Editor editor = null;
Lorealba_Database db;
Context context;
Timer timer;
TimerTask timerTask;
//we are going to use a handler to be able to run in our TimerTask
@@ -140,15 +139,15 @@ public class TimerActivity extends AppCompatActivity {
private void checkwait_status(Context context) {
db.open();
if (db.isCheck_Old_Product(visit_date)) {
check_data_managing_status(context, CommonString.Key_Download_Status);
check_data_managing_status(context);
}
}
private void check_data_managing_status(final Context context, String service_name) {
private void check_data_managing_status(final Context context) {
try {
JSONObject jsonObject = new JSONObject();
jsonObject.put("Downloadtype", service_name);
jsonObject.put("Downloadtype", CommonString.Key_Download_Status);
jsonObject.put("Username", "");
jsonObject.put("Param1", counter_id);
jsonObject.put("Param2", "");
@@ -162,7 +161,7 @@ public class TimerActivity extends AppCompatActivity {
Retrofit adapter = new Retrofit.Builder().baseUrl(CommonString.URL).client(okHttpClient).addConverterFactory(GsonConverterFactory.create()).build();
PostApi api = adapter.create(PostApi.class);
Call<ResponseBody> call = api.getTabjournePlan(jsonData);
call.enqueue(new Callback<ResponseBody>() {
call.enqueue(new Callback<>() {
@Override
public void onResponse(@NonNull Call<ResponseBody> call, @NonNull Response<ResponseBody> response) {
ResponseBody responseBody = response.body();
@@ -174,14 +173,13 @@ public class TimerActivity extends AppCompatActivity {
data = data.substring(1, data.length() - 1).replace("\\", "");
if (data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
process_data_Status = "";
AlertandMessages.showToastMsg((Activity) context, CommonString.KEY_FAILURE + " Please try again ");
AlertandMessages.showToastMsg(context, CommonString.KEY_FAILURE + " Please try again ");
} else if (!data.contains("No Data")) {
JCPGetterSetter jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
if (jcpObject != null && jcpObject.getDownloadStatus() != null) {
process_data_Status = jcpObject.getDownloadStatus().get(0).getDownloadStatus().trim();
if (process_data_Status.equalsIgnoreCase("Wait")) {
} else {
if (!process_data_Status.equalsIgnoreCase("Wait")) {
///finsh
stoptimertask();
startActivity(new Intent(context, DealarBoardActivity.class));
@@ -196,7 +194,7 @@ public class TimerActivity extends AppCompatActivity {
} catch (Exception e) {
process_data_Status = "";
e.fillInStackTrace();
AlertandMessages.showToastMsg((Activity) context, CommonString.MESSAGE_SOCKETEXCEPTION + "(" + e.toString() + ")");
AlertandMessages.showToastMsg(context, CommonString.MESSAGE_SOCKETEXCEPTION + "(" + e.toString() + ")");
}
} else {
process_data_Status = "";
@@ -207,7 +205,7 @@ public class TimerActivity extends AppCompatActivity {
@Override
public void onFailure(@NonNull Call<ResponseBody> call, @NonNull Throwable t) {
process_data_Status = "";
AlertandMessages.showToastMsg((Activity) context, CommonString.MESSAGE_SOCKETEXCEPTION);
AlertandMessages.showToastMsg(context, CommonString.MESSAGE_SOCKETEXCEPTION);
}
});
@@ -228,7 +226,7 @@ public class TimerActivity extends AppCompatActivity {
super.onResume();
db.open();
if (db.isCheck_Old_Product(visit_date)) {
if (process_data_Status != null && !process_data_Status.equals("") && process_data_Status.equalsIgnoreCase("Download")) {
if (process_data_Status != null && !process_data_Status.isEmpty() && process_data_Status.equalsIgnoreCase("Download")) {
///finsh
startActivity(new Intent(context, DealarBoardActivity.class));
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
@@ -238,6 +236,7 @@ public class TimerActivity extends AppCompatActivity {
}
@SuppressLint("MissingSuperCall")
@Override
public void onBackPressed() {
// super.onBackPressed();
app/src/main/java/com/cpm/lorealbaautomation/upload/ManualUploadActivity.java
+5 -6
View File
@@ -16,6 +16,7 @@ import android.os.Bundle;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@@ -70,6 +71,7 @@ import java.util.concurrent.TimeUnit;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
import retrofit.Converter;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -1841,7 +1843,6 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
@SuppressLint("NonConstantResourceId")
@Override
public void onClick(View view) {
if (view.getId() == R.id.img_manual_dataupload) {
if (CommonFunctions.checkNetIsAvailable(context)) {
masterList = db.getmasterTransaction(visit_date, counter_Id, true);
@@ -1864,8 +1865,6 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
} else {
AlertandMessages.showToastMsg(context, getString(R.string.nonetwork));
}
} else if (view.getId() == R.id.img_manual_imageupload) {
if (CommonFunctions.checkNetIsAvailable(context)) {
upload_imagewithfolder();
@@ -1922,6 +1921,7 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
}
}
Log.e("finalList", finalList.toString());
if (!finalList.isEmpty()) {
filename = "";
for (int i = 0; i < finalList.size(); i++) {
@@ -1966,7 +1966,6 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
} else {
foldername = "BulkUpload";
}
filename = finalList.get(i);
}
break;
@@ -1999,6 +1998,7 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
@Override
public void onResponse(retrofit.Response<String> response) {
try {
Log.e("finalList", response.toString());
if (response.code() == 200 && response.message().equalsIgnoreCase("OK") && response.isSuccess() && response.body().contains("Success")) {
if (finalFilename.contains("_counter_img_two_") || finalFilename.contains("_counter_img_one_") || finalFilename.contains("_cp_img_one_") || finalFilename.contains("_cp_img_two_") || finalFilename.contains("_groomed_img_mrng_") || finalFilename.contains("_groomed_img_noon_") || finalFilename.contains("_groomed_img_evning_")) {
db.open();
@@ -2006,7 +2006,6 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
} else {
finalFile1.delete();
}
statusforimage[0] = 1;
uploadedFiles[0]++;
} else {
@@ -2015,7 +2014,6 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
if (statusforimage[0] == 0) {
pd.dismiss();
AlertandMessages.showAlertlogin((Activity) context, "Image not uploaded.Please try again." + "\n" + uploadedFiles + " images uploaded out of " + totalFiles);
} else {
if (totalFiles == uploadedFiles[0]) {
pd.dismiss();
@@ -2026,6 +2024,7 @@ public class ManualUploadActivity extends AppCompatActivity implements View.OnCl
}
}
} catch (Exception e) {
Log.e("finalList", e.toString());
e.fillInStackTrace();
statusforimage[0] = -1;
pd.dismiss();
app/src/main/java/com/cpm/lorealbaautomation/upload/UploadKeyData.java
+4
View File
@@ -11,6 +11,7 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
@@ -53,6 +54,7 @@ import java.util.concurrent.TimeUnit;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
import retrofit.Converter;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
@@ -1854,6 +1856,7 @@ public class UploadKeyData extends AppCompatActivity implements View.OnClickList
}
}
Log.e("finalList", finalList.toString());
if (!finalList.isEmpty()) {
filename = "";
for (int i = 0; i < finalList.size(); i++) {
@@ -1993,6 +1996,7 @@ public class UploadKeyData extends AppCompatActivity implements View.OnClickList
}
@SuppressLint("MissingSuperCall")
@Override
public void onBackPressed() {
if (clicked_flag) {
app/src/main/res/layout-sw600dp/activity_ba_assessment.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyactivity.BaAssessmentActivity">
<!-- APP BAR -->
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:titleTextAppearance="@style/Toolbar.TitleTextPhone"/>
</com.google.android.material.appbar.AppBarLayout>
<!-- CONTENT BELOW TOOLBAR -->
<include
android:id="@+id/contentLayout"
layout="@layout/content_ba_assessment"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout-sw600dp/content_ba_assessment.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyactivity.BaAssessmentActivity"
android:background="@color/grey_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_ba_assessment">
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="@dimen/custom_margin60dp"
android:layout_height="@dimen/custom_margin60dp"
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<im.delight.android.webview.AdvancedWebView
android:id="@+id/webviewbaAssessment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/activity_ba_assessment.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyactivity.BaAssessmentActivity">
<!-- APP BAR -->
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:titleTextAppearance="@style/Toolbar.TitleTextPhone"/>
</com.google.android.material.appbar.AppBarLayout>
<!-- CONTENT BELOW TOOLBAR -->
<include
android:id="@+id/contentLayout"
layout="@layout/content_ba_assessment"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/content_ba_assessment.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyactivity.BaAssessmentActivity"
android:background="@color/grey_background"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_ba_assessment">
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="@dimen/custom_margin60dp"
android:layout_height="@dimen/custom_margin60dp"
android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<im.delight.android.webview.AdvancedWebView
android:id="@+id/webviewbaAssessment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/custom_sku_adapter.xml
+2 -1
View File
@@ -6,7 +6,8 @@
android:orientation="vertical"
android:weightSum="10">
<androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.cardview.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/report_cardview"
android:layout_width="match_parent"
android:layout_height="0dp"
app/src/main/res/mipmap-hdpi/ba_assessment.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

app/src/main/res/mipmap-mdpi/ba_assessment.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

app/src/main/res/xml/provider_paths.xml
+10 -2
View File
@@ -1,4 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="external_files" path="."/>
</paths>
<!-- Example: give access to files in the app's cache or files directory -->
<external-files-path
name="external_files"
path="." />
<!-- or internal -->
<files-path
name="internal_files"
path="." />
</paths>