some issues fixed
This commit is contained in:
parent
bc3cca9804
commit
c6368cfeae
|
@ -23,7 +23,7 @@ data class InspectionList (
|
||||||
val mosqueAuthority: String? = null,
|
val mosqueAuthority: String? = null,
|
||||||
val supervisorPhoneNumber: String? = null,
|
val supervisorPhoneNumber: String? = null,
|
||||||
val siteCondition: String? = null,
|
val siteCondition: String? = null,
|
||||||
val area: Long? = null,
|
val area: String? = null,
|
||||||
val womenPrayerArea: Boolean? = null,
|
val womenPrayerArea: Boolean? = null,
|
||||||
val totalWorshippersCapacity: Long? = null,
|
val totalWorshippersCapacity: Long? = null,
|
||||||
val totalRestrooms: Long? = null,
|
val totalRestrooms: Long? = null,
|
||||||
|
|
|
@ -18,13 +18,11 @@ object ApisRespHandler {
|
||||||
|
|
||||||
when (error) {
|
when (error) {
|
||||||
is AppError.ApiError -> {
|
is AppError.ApiError -> {
|
||||||
Log.e("ccshsh=1=>","${error}")
|
|
||||||
if (alertDialog == null)
|
if (alertDialog == null)
|
||||||
errorMessage(activity, error.message,error.statusCode)
|
errorMessage(activity, error.message,error.statusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
is AppError.ApiUnauthorized -> {
|
is AppError.ApiUnauthorized -> {
|
||||||
Log.e("ccshsh=2=>","${error}")
|
|
||||||
if (alertDialog == null)
|
if (alertDialog == null)
|
||||||
errorMessage(activity, error.message,401)
|
errorMessage(activity, error.message,401)
|
||||||
}
|
}
|
||||||
|
@ -38,7 +36,6 @@ object ApisRespHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
is AppError.ApiFailure -> {
|
is AppError.ApiFailure -> {
|
||||||
Log.e("ccshsh=3=>","${error}")
|
|
||||||
if (alertDialog == null) {
|
if (alertDialog == null) {
|
||||||
if (error.message.contains("Failed to connect to",true) ||
|
if (error.message.contains("Failed to connect to",true) ||
|
||||||
error.message.contains("Unable to resolve host",true) ||
|
error.message.contains("Unable to resolve host",true) ||
|
||||||
|
|
|
@ -243,21 +243,40 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/llItemQuality"
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtApproximateNumber"
|
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/item_quantity"
|
|
||||||
android:fontFamily="@font/montserratregular"
|
|
||||||
android:layout_marginTop="@dimen/dp_12"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
app:layout_constraintTop_toBottomOf="@id/llUnits"
|
app:layout_constraintTop_toBottomOf="@id/llUnits"
|
||||||
|
android:layout_marginTop="@dimen/dp_12"
|
||||||
|
>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/item_quantity"
|
||||||
|
android:fontFamily="@font/montserratregular"
|
||||||
android:textSize="@dimen/sp_14"
|
android:textSize="@dimen/sp_14"
|
||||||
/>
|
/>
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="*"
|
||||||
|
android:fontFamily="@font/montserratregular"
|
||||||
|
android:textColor="@color/star_color"
|
||||||
|
android:textSize="@dimen/sp_14"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etItemQuantity"
|
android:id="@+id/etItemQuantity"
|
||||||
|
@ -266,7 +285,7 @@
|
||||||
android:background="@drawable/rounded_edit_text_background"
|
android:background="@drawable/rounded_edit_text_background"
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
app:layout_constraintTop_toBottomOf="@id/txtApproximateNumber"
|
app:layout_constraintTop_toBottomOf="@id/llItemQuality"
|
||||||
android:layout_marginTop="@dimen/dp_4"
|
android:layout_marginTop="@dimen/dp_4"
|
||||||
android:text=""
|
android:text=""
|
||||||
android:maxLength="4"
|
android:maxLength="4"
|
||||||
|
@ -282,20 +301,41 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/llItemValue"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/etItemQuantity"
|
||||||
|
android:layout_marginTop="@dimen/dp_12"
|
||||||
|
>
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/txtItemValue"
|
android:id="@+id/txtItemValue"
|
||||||
android:layout_width="0dp"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/item_value"
|
android:text="@string/item_value"
|
||||||
android:fontFamily="@font/montserratregular"
|
android:fontFamily="@font/montserratregular"
|
||||||
android:layout_marginTop="@dimen/dp_12"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/etItemQuantity"
|
|
||||||
android:textSize="@dimen/sp_14"
|
android:textSize="@dimen/sp_14"
|
||||||
/>
|
/>
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="*"
|
||||||
|
android:fontFamily="@font/montserratregular"
|
||||||
|
android:textColor="@color/star_color"
|
||||||
|
android:textSize="@dimen/sp_14"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:id="@+id/etItemValue"
|
android:id="@+id/etItemValue"
|
||||||
|
@ -304,7 +344,7 @@
|
||||||
android:background="@drawable/rounded_edit_text_background"
|
android:background="@drawable/rounded_edit_text_background"
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
app:layout_constraintTop_toBottomOf="@id/txtItemValue"
|
app:layout_constraintTop_toBottomOf="@id/llItemValue"
|
||||||
android:layout_marginTop="@dimen/dp_4"
|
android:layout_marginTop="@dimen/dp_4"
|
||||||
android:hint="@string/please_enter_item_value"
|
android:hint="@string/please_enter_item_value"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
@ -315,18 +355,41 @@
|
||||||
android:textSize="@dimen/sp_14"
|
android:textSize="@dimen/sp_14"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/txtAddImage"
|
<LinearLayout
|
||||||
|
android:id="@+id/llImageView"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/add_image"
|
|
||||||
android:fontFamily="@font/montserratregular"
|
|
||||||
android:layout_marginTop="@dimen/dp_12"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
app:layout_constraintTop_toBottomOf="@id/etItemValue"
|
app:layout_constraintTop_toBottomOf="@id/etItemValue"
|
||||||
|
android:layout_marginTop="@dimen/dp_12"
|
||||||
|
>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/add_image"
|
||||||
|
android:fontFamily="@font/montserratregular"
|
||||||
|
|
||||||
android:textSize="@dimen/sp_14"
|
android:textSize="@dimen/sp_14"
|
||||||
/>
|
/>
|
||||||
|
<TextView
|
||||||
|
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="*"
|
||||||
|
android:fontFamily="@font/montserratregular"
|
||||||
|
android:textColor="@color/star_color"
|
||||||
|
android:textSize="@dimen/sp_14"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/rvImage"
|
android:id="@+id/rvImage"
|
||||||
|
@ -334,7 +397,7 @@
|
||||||
android:layout_height="@dimen/dp_120"
|
android:layout_height="@dimen/dp_120"
|
||||||
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
app:layout_constraintStart_toEndOf="@id/leftGuide"
|
||||||
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
app:layout_constraintEnd_toStartOf="@id/rightGuide"
|
||||||
app:layout_constraintTop_toBottomOf="@id/txtAddImage"
|
app:layout_constraintTop_toBottomOf="@id/llImageView"
|
||||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
android:layout_marginTop="@dimen/dp_8"
|
android:layout_marginTop="@dimen/dp_8"
|
||||||
android:orientation="horizontal"/>
|
android:orientation="horizontal"/>
|
||||||
|
|
Loading…
Reference in a new issue