diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java index 6cd1067..13201c5 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/ContainerDetailActivity.java @@ -23,6 +23,7 @@ import com.utopiaindustries.selftrucking.Activities.dashboardScreens.viewModels. import com.utopiaindustries.selftrucking.Activities.loginScreens.SplashActivity; import com.utopiaindustries.selftrucking.R; import com.utopiaindustries.selftrucking.helper.Helper; +import com.utopiaindustries.selftrucking.helper.Preference; import com.utopiaindustries.selftrucking.models.ContainerWorkflow; import com.utopiaindustries.selftrucking.models.DriverResponse; import com.utopiaindustries.selftrucking.models.PickResponse; @@ -232,17 +233,17 @@ public class ContainerDetailActivity extends AppCompatActivity { Log.e("containerToUpdate1-truckLoadId: ",""+containerWorkflow.getTruckLoadId());*/ container_no.setText(Html.fromHtml("Container No: " + containerWorkflow.getContainerNo(), Html.FROM_HTML_MODE_LEGACY)); - container_origin.setText(Html.fromHtml("Container Origin: " + containerWorkflow.getOrigin(), Html.FROM_HTML_MODE_LEGACY)); - containerDestination.setText(Html.fromHtml("Container Destination: " + containerWorkflow.getDestination(), Html.FROM_HTML_MODE_LEGACY)); + container_origin.setText(Html.fromHtml("Terminal Info: " + containerWorkflow.getOrigin(), Html.FROM_HTML_MODE_LEGACY)); + containerDestination.setText(Html.fromHtml("Destination: " + containerWorkflow.getDestination(), Html.FROM_HTML_MODE_LEGACY)); driverId.setText(Html.fromHtml("Driver Id: " + truckerId, Html.FROM_HTML_MODE_LEGACY)); driverName.setText(Html.fromHtml("Driver Name: " + truckerName, Html.FROM_HTML_MODE_LEGACY)); currentStatus = containerWorkflow.getCurrentStatus(); if (containerWorkflow.getCurrentStatus() != null && !containerWorkflow.getCurrentStatus().equalsIgnoreCase("")) { - container_status.setText(Html.fromHtml("Container Status: " + containerWorkflow.getCurrentStatus(), Html.FROM_HTML_MODE_LEGACY)); + container_status.setText(Html.fromHtml("Status: " + containerWorkflow.getCurrentStatus(), Html.FROM_HTML_MODE_LEGACY)); } else { - container_status.setText(Html.fromHtml("Container Status: " + "Assigned", Html.FROM_HTML_MODE_LEGACY)); + container_status.setText(Html.fromHtml("Status: " + "Assigned", Html.FROM_HTML_MODE_LEGACY)); } if (containerWorkflow.getCurrentStatus() != null) { @@ -251,12 +252,14 @@ public class ContainerDetailActivity extends AppCompatActivity { case "PICKED": + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,3); btnMarkPicked.setBackgroundColor(ContextCompat.getColor(this, R.color.picked_color)); btnMarkPicked.setText("Mark it Dropped"); currentStatus = "DROPPED"; break; case "DROPPED": + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,4); btnMarkPicked.setBackgroundColor(ContextCompat.getColor(this, R.color.dropped_color)); btnMarkPicked.setText("Mark it Completed"); currentStatus = "COMPLETED"; @@ -264,6 +267,7 @@ public class ContainerDetailActivity extends AppCompatActivity { case "COMPLETED": //btnMarkPicked.setBackgroundColor(ContextCompat.getColor(this, R.color.completed_color)); + Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,0); btnMarkPicked.setText("Mark it Picked"); currentStatus = "PICKED"; diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java index 7f05c38..9d13a85 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/dashboardScreens/HomeActivity.java @@ -64,6 +64,7 @@ public class HomeActivity extends AppCompatActivity implements SelectListener { DriverResponse driverResponse; TextView txtDriverName, txtNoData; ImageView imgLogout; + int currentPositionStatus = 0; @Override protected void onCreate(Bundle savedInstanceState) { @@ -114,9 +115,16 @@ public class HomeActivity extends AppCompatActivity implements SelectListener { adapterItems = new ArrayAdapter(this, R.layout.list_items, item); autoCompleteTextView.setAdapter(adapterItems); if (item.length > 0) { - autoCompleteTextView.setText(item[0], false); + boolean keyExists = Preference.containsKey(Helper.project_file, "CurrentPosition", this); + if (keyExists) { + Log.e("Key-Exist: ", "True"); + currentPositionStatus = Preference.getMyIntPref(Helper.project_file, "CurrentPosition", this); + autoCompleteTextView.setText(item[currentPositionStatus], false); + } else { + Log.e("Key-Exist: ", "False"); + autoCompleteTextView.setText(item[0], false); + } } - } private void filterList(String status) { diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/SplashActivity.java b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/SplashActivity.java index 148dbc6..d70daf0 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/SplashActivity.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/Activities/loginScreens/SplashActivity.java @@ -40,6 +40,7 @@ public class SplashActivity extends AppCompatActivity { txtVersion.setText(getResources().getString(R.string.app_version)); isLoggedIn = Preference.getMyBooleanPref(Helper.project_file, "isLoggedIn", getApplicationContext()); + //Preference.setMyIntPref(Helper.project_file, "CurrentPosition",this,0); new Handler().postDelayed(new Runnable() { public void run() { diff --git a/app/src/main/java/com/utopiaindustries/selftrucking/helper/Preference.java b/app/src/main/java/com/utopiaindustries/selftrucking/helper/Preference.java index 9514c3e..a401f72 100644 --- a/app/src/main/java/com/utopiaindustries/selftrucking/helper/Preference.java +++ b/app/src/main/java/com/utopiaindustries/selftrucking/helper/Preference.java @@ -23,6 +23,10 @@ public class Preference { return context.getSharedPreferences(nameOfFile, Context.MODE_PRIVATE); } + public static boolean containsKey(String fileName, String key, Context context) { + return getPrefs(fileName, context).contains(key); + } + public static String getMyStringPref(String fileName, String key, Context context) { return getPrefs(fileName,context).getString(key, "default"); diff --git a/app/src/main/res/layout/activity_container_detail.xml b/app/src/main/res/layout/activity_container_detail.xml index 401ac88..ee83add 100644 --- a/app/src/main/res/layout/activity_container_detail.xml +++ b/app/src/main/res/layout/activity_container_detail.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:padding="5dp" android:textSize="@dimen/_13sdp" - android:text="Origin: Warehouse" /> + android:text="Terminal Info:: Warehouse" /> @@ -54,9 +54,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_below="@+id/container_no" - android:layout_weight="0.3" + android:layout_weight="0.35" android:padding="5dp" - android:text="Origin: " + android:text="Terminal Info:" android:textSize="@dimen/_13sdp" android:textStyle="bold" /> @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/container_no" android:layout_marginStart="2dp" - android:layout_weight="0.7" + android:layout_weight="0.65" android:padding="5dp" android:text="Origin" android:textSize="@dimen/_13sdp" /> @@ -83,7 +83,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_below="@+id/container_origin" - android:layout_weight="0.3" + android:layout_weight="0.35" android:padding="5dp" android:text="Destination: " android:textSize="@dimen/_13sdp" @@ -95,7 +95,7 @@ android:layout_height="wrap_content" android:layout_below="@+id/container_origin" android:layout_marginStart="2dp" - android:layout_weight="0.7" + android:layout_weight="0.65" android:padding="5dp" android:text="Destination" android:textSize="@dimen/_13sdp" />