Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix su posizionamento pulsanti in DialogChooseArts

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-01-13 10:38:52 +01:00
parent d65ffb45c2
commit 1f83e9b492
2 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
View File

@ -98,6 +98,10 @@ public class DialogChooseArtsFromListaArts {
mDialog.setCanceledOnTouchOutside(false); mDialog.setCanceledOnTouchOutside(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
mDialog.setOnCancelListener(dialog -> {
if(this.mOnAbort != null) this.mOnAbort.run();
});
UtilityDialog.setTo90PercentSize(context, mDialog); UtilityDialog.setTo90PercentSize(context, mDialog);
@ -137,8 +141,6 @@ public class DialogChooseArtsFromListaArts {
} }
private void setupBarcode() { private void setupBarcode() {
final boolean prevBarcodeStatus = BarcodeManager.isEnabled();
BarcodeManager.enable(); BarcodeManager.enable();
int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
@ -147,8 +149,6 @@ public class DialogChooseArtsFromListaArts {
mDialog.setOnDismissListener(dialog -> { mDialog.setOnDismissListener(dialog -> {
BarcodeManager.removeCallback(barcodeIstanceID); BarcodeManager.removeCallback(barcodeIstanceID);
// if(prevBarcodeStatus) BarcodeManager.enable();
// else BarcodeManager.disable();
}); });
} }

61
app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
View File

@ -20,37 +20,29 @@
app:cardCornerRadius="12dp" app:cardCornerRadius="12dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<!--<RelativeLayout-->
<!--android:id="@+id/title_container"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:background="@color/light_blue_300"-->
<!--android:gravity="center_horizontal">-->
<!--<androidx.appcompat.widget.AppCompatImageView-->
<!--android:id="@+id/title_icon"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:src="@drawable/ic_error_white_24dp"-->
<!--android:layout_margin="24dp"/>-->
<!--</RelativeLayout>-->
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="24dp" android:paddingTop="24dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp"> android:paddingEnd="8dp"
app:layout_constraintBottom_toTopOf="@+id/buttons"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_default="wrap"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" >
<TextView <TextView
android:id="@+id/title_text" android:id="@+id/title_text"
@ -58,7 +50,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextViewMaterial.DialogTitle" style="@style/TextViewMaterial.DialogTitle"
android:text="@string/dialog_choose_arts_from_lista_art" android:text="@string/dialog_choose_arts_from_lista_art"
android:gravity="center_horizontal"/> android:gravity="center_horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
@ -73,20 +68,25 @@
app:strokeColor="@color/red_400" app:strokeColor="@color/red_400"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:visibility="@{filterStatus.get() ? View.VISIBLE : View.GONE}" android:visibility="@{filterStatus.get() ? View.VISIBLE : View.GONE}"
android:text="@string/remove_filter_button"/> android:text="@string/remove_filter_button"
app:layout_constraintTop_toBottomOf="@id/title_text"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"> android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/button_remove_filter"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<LinearLayout <RelativeLayout
android:id="@+id/empty_view" android:id="@+id/empty_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center" android:gravity="center"
android:padding="16dp" android:padding="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
@ -101,7 +101,7 @@
android:gravity="center" android:gravity="center"
android:textColor="@color/empty_view_gray"/> android:textColor="@color/empty_view_gray"/>
</LinearLayout> </RelativeLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/dialog_choose_arts_from_lista_art__main_list" android:id="@+id/dialog_choose_arts_from_lista_art__main_list"
@ -112,7 +112,7 @@
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -122,7 +122,12 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:paddingBottom="8dp"> android:paddingBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/center_guideline" android:id="@+id/center_guideline"
@ -162,7 +167,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>