Skip to content

Add info for visited stations screen #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Add info for visited stations screen #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions app/src/main/res/layout/activity_visited_polling_stations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@

</com.google.android.material.appbar.AppBarLayout>

<ProgressBar
android:id="@+id/loadingIndicator"
android:layout_width="wrap_content"
<TextView
android:id="@+id/visitedStationsLabel"
style="@style/Text.Label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appBar" />
android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/big_margin"
android:layout_marginEnd="@dimen/big_margin"
android:layout_marginBottom="@dimen/small_margin"
android:text="@string/polling_station_visited_label" />

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
Expand All @@ -41,6 +42,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ProgressBar
android:id="@+id/loadingIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/visitedStations"
android:layout_width="match_parent"
Expand All @@ -49,8 +61,8 @@
android:layout_marginTop="@dimen/big_margin"
android:layout_marginEnd="@dimen/margin"
android:layout_marginBottom="@dimen/big_margin"
android:paddingBottom="@dimen/small_margin"
android:overScrollMode="never"
android:paddingBottom="@dimen/small_margin"
android:scrollbars="none"
app:layout_constraintTop_toTopOf="parent"
tools:itemCount="3"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ro-rRO/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<string name="invalid_polling_station_time_in">Alege ora sosirii</string>
<string name="invalid_time_input">Ora plecării nu poate fi mai mică decât ora sosirii</string>
<string name="polling_station_visited">Secţia de votare %1$d %2$s</string>
<string name="polling_station_visited_label">Aici găsești secțiile pe care le-ai vizitat deja. Apasă pe o secție să verifici sau să editezi răspunsuri.</string>

<!-- Forms list -->
<string name="form_notes">Adaugă notă</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<string name="invalid_polling_station_time_in">Select the time of arrival</string>
<string name="invalid_time_input">Arrival needs to be before departure</string>
<string name="polling_station_visited">Polling station %1$d %2$s</string>
<string name="polling_station_visited_label">This is the list of stations you already visited. Tap one to view or edit its submitted answers.</string>

<!-- Forms list -->
<string name="form_notes">Add a message</string>
Expand Down