Better ui experience for user and more string resources
This commit is contained in:
parent
6012256a17
commit
01a15466c0
|
|
@ -14,35 +14,82 @@
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_above="@id/btnSubmit"
|
android:layout_above="@id/btnSubmitContainer"
|
||||||
android:layout_below="@id/toolbar"
|
android:layout_below="@id/toolbar"
|
||||||
android:fillViewport="true"
|
android:fillViewport="true"
|
||||||
android:fitsSystemWindows="true"
|
android:fitsSystemWindows="true"
|
||||||
android:padding="@dimen/layout_padding">
|
android:clipToPadding="false"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
<LinearLayout
|
<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">
|
||||||
|
|
||||||
|
<!-- Report Form Card -->
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
app:cardCornerRadius="12dp"
|
||||||
|
app:cardElevation="4dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/add_report"
|
||||||
|
android:textSize="20sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- Image Container -->
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
app:cardCornerRadius="8dp"
|
||||||
|
app:strokeWidth="1dp"
|
||||||
|
app:strokeColor="?attr/colorPrimary"
|
||||||
|
app:cardElevation="0dp">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivReportPhoto"
|
android:id="@+id/ivReportPhoto"
|
||||||
android:layout_width="@dimen/image_view_width"
|
android:layout_width="@dimen/image_view_width"
|
||||||
android:layout_height="@dimen/image_view_height"
|
android:layout_height="@dimen/image_view_height"
|
||||||
android:layout_gravity="center"
|
android:padding="@dimen/content_padding"
|
||||||
android:layout_margin="@dimen/layout_padding"
|
|
||||||
android:background="@drawable/rectangle"
|
android:background="@drawable/rectangle"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:padding="@dimen/content_padding"
|
|
||||||
android:src="@drawable/logo_add_location" />
|
android:src="@drawable/logo_add_location" />
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/tap_to_add_photo"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- Place Name Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginTop="8dp"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etPlaceName"
|
android:id="@+id/etPlaceName"
|
||||||
|
|
@ -56,12 +103,18 @@
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<!-- Description Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginTop="16dp"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary"
|
||||||
|
app:counterEnabled="true"
|
||||||
|
app:counterMaxLength="200">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etDescription"
|
android:id="@+id/etDescription"
|
||||||
|
|
@ -70,21 +123,63 @@
|
||||||
android:hint="@string/Enter_Description"
|
android:hint="@string/Enter_Description"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="textImeMultiLine"
|
android:inputType="textImeMultiLine"
|
||||||
|
android:minLines="3"
|
||||||
android:maxLines="5"
|
android:maxLines="5"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<!-- Rating Card -->
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:cardCornerRadius="12dp"
|
||||||
|
app:cardElevation="4dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<!-- Rating Header -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/how_would_you_rate_this_place"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- Rating Options -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:baselineAligned="false"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<!-- Good Rating -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
app:cardCornerRadius="24dp"
|
||||||
|
app:cardElevation="2dp"
|
||||||
|
app:cardBackgroundColor="@android:color/transparent">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivThumbsUp"
|
android:id="@+id/ivThumbsUp"
|
||||||
|
|
@ -94,28 +189,40 @@
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:contentDescription="Thumbs Up"
|
android:contentDescription="Thumbs Up"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:padding="8dp"
|
android:padding="12dp"
|
||||||
app:tint="?attr/colorOnBackground"
|
app:tint="@color/green"
|
||||||
android:src="@drawable/ic_thumb_up_border" />
|
android:src="@drawable/ic_thumb_up_border" />
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/GOOD"
|
android:text="@string/GOOD"
|
||||||
android:textColor="?attr/colorPrimary"
|
android:textColor="?attr/colorPrimary"
|
||||||
android:textSize="@dimen/textSizeInEditText"
|
android:textSize="@dimen/textSizeInEditText"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<Space
|
<!-- Average Rating -->
|
||||||
android:layout_width="@dimen/edit_text_padding"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
app:cardCornerRadius="24dp"
|
||||||
|
app:cardElevation="2dp"
|
||||||
|
app:cardBackgroundColor="@android:color/transparent">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivThumbsAverage"
|
android:id="@+id/ivThumbsAverage"
|
||||||
|
|
@ -125,28 +232,41 @@
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:contentDescription="Thumbs Average"
|
android:contentDescription="Thumbs Average"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:padding="8dp"
|
android:rotation="260"
|
||||||
app:tint="?attr/colorOnBackground"
|
android:padding="12dp"
|
||||||
|
app:tint="@color/yellow"
|
||||||
android:src="@drawable/ic_thumb_up_border" />
|
android:src="@drawable/ic_thumb_up_border" />
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/AVERAGE"
|
android:text="@string/AVERAGE"
|
||||||
android:textColor="?attr/colorPrimary"
|
android:textColor="?attr/colorPrimary"
|
||||||
android:textSize="@dimen/textSizeInEditText"
|
android:textSize="@dimen/textSizeInEditText"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<Space
|
<!-- Bad Rating -->
|
||||||
android:layout_width="@dimen/edit_text_padding"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
app:cardCornerRadius="24dp"
|
||||||
|
app:cardElevation="2dp"
|
||||||
|
app:cardBackgroundColor="@android:color/transparent">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivThumbsDown"
|
android:id="@+id/ivThumbsDown"
|
||||||
|
|
@ -156,14 +276,16 @@
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:contentDescription="Thumbs Down"
|
android:contentDescription="Thumbs Down"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:padding="8dp"
|
android:padding="12dp"
|
||||||
app:tint="?attr/colorOnBackground"
|
app:tint="@color/red"
|
||||||
android:src="@drawable/ic_thumb_down_border" />
|
android:src="@drawable/ic_thumb_down_border" />
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
<com.google.android.material.textview.MaterialTextView
|
<com.google.android.material.textview.MaterialTextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/BAD"
|
android:text="@string/BAD"
|
||||||
android:textColor="?attr/colorPrimary"
|
android:textColor="?attr/colorPrimary"
|
||||||
android:textSize="@dimen/textSizeInEditText"
|
android:textSize="@dimen/textSizeInEditText"
|
||||||
|
|
@ -171,18 +293,29 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatButton
|
<!-- Submit Button Container -->
|
||||||
android:id="@+id/btnSubmit"
|
<FrameLayout
|
||||||
|
android:id="@+id/btnSubmitContainer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:background="?attr/colorPrimary"
|
android:background="@android:color/white"
|
||||||
android:backgroundTintMode="src_atop"
|
android:elevation="8dp"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
|
android:id="@+id/btnSubmit"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="12dp"
|
||||||
|
android:paddingBottom="12dp"
|
||||||
android:text="@string/SUBMIT"
|
android:text="@string/SUBMIT"
|
||||||
android:textColor="?attr/colorOnPrimary"
|
android:textStyle="bold"
|
||||||
tools:ignore="HardcodedText"
|
app:cornerRadius="8dp"
|
||||||
/>
|
tools:ignore="HardcodedText" />
|
||||||
|
</FrameLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
@ -15,23 +15,69 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_below="@id/toolbar"
|
android:layout_below="@id/toolbar"
|
||||||
android:layout_centerInParent="true"
|
|
||||||
android:fillViewport="true"
|
android:fillViewport="true"
|
||||||
android:padding="@dimen/layout_padding">
|
android:clipToPadding="false"
|
||||||
|
android:padding="24dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<!-- Logo and Welcome Section -->
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="120dp"
|
||||||
|
android:layout_height="120dp"
|
||||||
|
android:layout_marginBottom="24dp"
|
||||||
|
android:src="@drawable/logo_add_location"
|
||||||
|
android:contentDescription="App Logo" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/welcome_back"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textSize="28sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:layout_marginBottom="8dp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/sign_in_to_continue"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textColor="?attr/colorOnSurface"
|
||||||
|
android:alpha="0.7"
|
||||||
|
android:layout_marginBottom="32dp" />
|
||||||
|
|
||||||
|
<!-- Login Form Card -->
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:cardCornerRadius="16dp"
|
||||||
|
app:cardElevation="4dp"
|
||||||
|
android:layout_marginBottom="24dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="24dp">
|
||||||
|
|
||||||
|
<!-- Username Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginBottom="16dp"
|
||||||
app:startIconDrawable="@drawable/ic_email">
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary"
|
||||||
|
app:startIconDrawable="@drawable/ic_email"
|
||||||
|
app:startIconTint="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etUsername"
|
android:id="@+id/etUsername"
|
||||||
|
|
@ -39,16 +85,23 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/Enter_Username"
|
android:hint="@string/Enter_Username"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="textPersonName" />
|
android:inputType="textPersonName"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
android:paddingBottom="16dp" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<!-- Password Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginBottom="24dp"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary"
|
||||||
app:passwordToggleEnabled="true"
|
app:passwordToggleEnabled="true"
|
||||||
app:startIconDrawable="@drawable/ic_lock">
|
app:passwordToggleTint="?attr/colorPrimary"
|
||||||
|
app:startIconDrawable="@drawable/ic_lock"
|
||||||
|
app:startIconTint="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etPassword"
|
android:id="@+id/etPassword"
|
||||||
|
|
@ -56,45 +109,68 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/Enter_Password"
|
android:hint="@string/Enter_Password"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="textPassword" />
|
android:inputType="textPassword"
|
||||||
|
android:paddingTop="16dp"
|
||||||
|
android:paddingBottom="16dp" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatButton
|
<!-- Forgot Password Link -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvForgotPassword"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="end"
|
||||||
|
android:text="Forgot Password?"
|
||||||
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:layout_marginBottom="24dp"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
|
android:padding="4dp" />
|
||||||
|
|
||||||
|
<!-- Login Button -->
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/btnLogin"
|
android:id="@+id/btnLogin"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:paddingTop="14dp"
|
||||||
android:background="?attr/colorPrimary"
|
android:paddingBottom="14dp"
|
||||||
android:backgroundTintMode="src_atop"
|
|
||||||
android:text="@string/LOGIN"
|
android:text="@string/LOGIN"
|
||||||
android:textColor="?attr/colorOnPrimary"
|
android:textSize="16sp"
|
||||||
android:textSize="@dimen/textSizeInEditText" />
|
android:textStyle="bold"
|
||||||
|
app:cornerRadius="12dp"
|
||||||
|
app:elevation="2dp" />
|
||||||
|
</LinearLayout>
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
|
|
||||||
|
<!-- Registration Link -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center_horizontal">
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center"
|
||||||
|
android:background="?attr/selectableItemBackground"
|
||||||
|
android:clickable="true"
|
||||||
|
android:focusable="true"
|
||||||
|
android:padding="8dp">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:text="@string/Dont_have_an_Account"
|
||||||
android:text="@string/Dont_have_an_Account" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvRegisterRedirect"
|
android:id="@+id/tvRegisterRedirect"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_marginStart="@dimen/small_content_padding"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginStart="4dp"
|
||||||
android:text="@string/Please_register"
|
android:text="@string/Please_register"
|
||||||
android:textColor="?attr/colorPrimary"
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:textSize="14sp"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
@ -1,93 +1,167 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
app:cardCornerRadius="12dp"
|
||||||
|
app:cardElevation="4dp">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/llInput"
|
android:id="@+id/llInput"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_margin="@dimen/layout_padding"
|
android:orientation="vertical"
|
||||||
android:orientation="vertical">
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/add_new_location"
|
||||||
|
android:textSize="24sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="?attr/colorPrimary"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- Location Image with improved container -->
|
||||||
|
<com.google.android.material.card.MaterialCardView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
app:cardCornerRadius="8dp"
|
||||||
|
app:strokeWidth="1dp"
|
||||||
|
app:strokeColor="?attr/colorPrimary"
|
||||||
|
app:cardElevation="0dp">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/ivPlacePhoto"
|
android:id="@+id/ivPlacePhoto"
|
||||||
android:layout_width="@dimen/image_view_width"
|
android:layout_width="@dimen/image_view_width"
|
||||||
android:layout_height="@dimen/image_view_height"
|
android:layout_height="@dimen/image_view_height"
|
||||||
android:layout_gravity="center"
|
android:padding="@dimen/content_padding"
|
||||||
android:layout_margin="@dimen/layout_padding"
|
android:src="@drawable/logo_add_location"
|
||||||
android:background="@drawable/rectangle"
|
android:background="@drawable/rectangle"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no" />
|
||||||
android:padding="@dimen/content_padding"
|
</com.google.android.material.card.MaterialCardView>
|
||||||
android:src="@drawable/logo_add_location" />
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/tap_to_add_photo"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:layout_marginBottom="16dp"/>
|
||||||
|
|
||||||
|
<!-- Place Name Field with improved styling -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginTop="8dp"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
android:layout_marginBottom="8dp"
|
||||||
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etPlaceName"
|
android:id="@+id/etPlaceName"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="39dp"
|
||||||
android:hint="@string/Enter_Place_Name"
|
android:hint="@string/Enter_Place_Name"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<!-- Location Section Header -->
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:text="@string/location_details"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<!-- Coordinates Container -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:baselineAligned="false"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<!-- Latitude Field -->
|
||||||
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:layout_marginEnd="4dp"
|
||||||
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etLatitude"
|
android:id="@+id/etLatitude"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/Enter_Latitude"
|
android:hint="@string/Enter_Latitude"
|
||||||
android:importantForAutofill="no"
|
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
|
android:importantForAutofill="no"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<!-- Longitude Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_weight="1"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
android:layout_marginStart="4dp"
|
||||||
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etLongitude"
|
android:id="@+id/etLongitude"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/Enter_Longitude"
|
android:hint="@string/Enter_Longitude"
|
||||||
android:importantForAutofill="no"
|
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:focusable="false"
|
android:focusable="false"
|
||||||
|
android:importantForAutofill="no"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Address Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:layout_marginTop="16dp"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etAddress"
|
android:id="@+id/etAddress"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="38dp"
|
||||||
android:hint="@string/Enter_Address"
|
android:hint="@string/Enter_Address"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="textImeMultiLine"
|
android:inputType="textImeMultiLine"
|
||||||
|
|
@ -95,34 +169,51 @@
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
|
<!-- Description Section Header -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/additional_information"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:layout_marginBottom="8dp"/>
|
||||||
|
|
||||||
|
<!-- Description Field -->
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
app:startIconDrawable="@drawable/ic_location"
|
||||||
app:startIconDrawable="@drawable/ic_location">
|
app:startIconTint="?attr/colorPrimary"
|
||||||
|
app:boxStrokeColor="?attr/colorPrimary"
|
||||||
|
app:hintTextColor="?attr/colorPrimary">
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputEditText
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
android:id="@+id/etPlaceDescription"
|
android:id="@+id/etPlaceDescription"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/Enter_Place_Description"
|
android:hint="@string/Enter_Place_Description"
|
||||||
android:importantForAutofill="no"
|
|
||||||
android:inputType="textImeMultiLine"
|
android:inputType="textImeMultiLine"
|
||||||
|
android:minLines="3"
|
||||||
android:maxLines="5"
|
android:maxLines="5"
|
||||||
|
android:importantForAutofill="no"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</com.google.android.material.textfield.TextInputLayout>
|
</com.google.android.material.textfield.TextInputLayout>
|
||||||
|
|
||||||
<androidx.appcompat.widget.AppCompatButton
|
<!-- Submit Button with improved styling -->
|
||||||
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/btnSubmit"
|
android:id="@+id/btnSubmit"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?attr/colorPrimary"
|
android:layout_marginTop="24dp"
|
||||||
android:backgroundTintMode="src_atop"
|
android:paddingTop="12dp"
|
||||||
android:layout_marginTop="@dimen/layout_padding"
|
android:paddingBottom="12dp"
|
||||||
android:text="@string/SUBMIT"
|
android:text="@string/SUBMIT"
|
||||||
android:textColor="?attr/colorOnPrimary"
|
android:textStyle="bold"
|
||||||
|
app:cornerRadius="8dp"
|
||||||
|
app:elevation="2dp"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</com.google.android.material.card.MaterialCardView>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
@ -150,6 +150,11 @@
|
||||||
<!-- <string name="Logout">Logout</string>-->
|
<!-- <string name="Logout">Logout</string>-->
|
||||||
|
|
||||||
<string name="google_maps_api_key">AIzaSyCzcuZhHd-GqadewAiCbh4NuaBhO2AcPOY</string>
|
<string name="google_maps_api_key">AIzaSyCzcuZhHd-GqadewAiCbh4NuaBhO2AcPOY</string>
|
||||||
|
<string name="add_new_location">Add New Location</string>
|
||||||
|
<string name="add_report">Rate this place!</string>
|
||||||
|
<string name="how_would_you_rate_this_place">How would you rate the accessibility of this place?</string>
|
||||||
|
<string name="welcome_back">Welcome Back</string>
|
||||||
|
<string name="sign_in_to_continue">Sign in to continue</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -153,6 +153,14 @@
|
||||||
|
|
||||||
|
|
||||||
<string name="google_maps_api_key">AIzaSyCzcuZhHd-GqadewAiCbh4NuaBhO2AcPOY</string>
|
<string name="google_maps_api_key">AIzaSyCzcuZhHd-GqadewAiCbh4NuaBhO2AcPOY</string>
|
||||||
|
<string name="add_new_location">Add New Location</string>
|
||||||
|
<string name="tap_to_add_photo">Tap to add photo</string>
|
||||||
|
<string name="location_details">Location Details</string>
|
||||||
|
<string name="additional_information">Additional Information</string>
|
||||||
|
<string name="add_report">Rate this place!</string>
|
||||||
|
<string name="how_would_you_rate_this_place">How would you rate the accessibility of this place?</string>
|
||||||
|
<string name="welcome_back">Welcome Back</string>
|
||||||
|
<string name="sign_in_to_continue">Sign in to continue</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
Loading…
Reference in New Issue