Skip to content
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

Jackie Ho - Accessibility lab #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Jackie Ho - Accessibility lab #2

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
831 changes: 831 additions & 0 deletions solution.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions starter-code/app/src/main/res/layout/activity_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
android:layout_weight="1"
android:padding="27dp"
android:src="@drawable/where"
android:contentDescription="Where is this?"
/>

<ImageView
Expand All @@ -149,6 +150,7 @@
android:layout_weight="1"
android:padding="27dp"
android:src="@drawable/when"
android:contentDescription="When is this?"
/>

<ImageView
Expand All @@ -158,6 +160,7 @@
android:layout_weight="1"
android:padding="27dp"
android:src="@drawable/who"
android:contentDescription="Who is this?"
/>

<ImageView
Expand All @@ -167,6 +170,7 @@
android:layout_weight="1"
android:padding="27dp"
android:src="@drawable/what"
android:contentDescription="What is this?"
/>

</LinearLayout>
Expand Down
7 changes: 5 additions & 2 deletions starter-code/app/src/main/res/layout/bar_chart_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
style="@style/card"
card_view:cardBackgroundColor="#FFFFFF"
card_view:cardCornerRadius="10dp"
card_view:cardElevation="6dp">
card_view:cardElevation="6dp"
android:contentDescription="Percentage of harassment among groups of people">

<RelativeLayout
android:layout_width="match_parent"
Expand All @@ -37,7 +38,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/chart_header"
android:background="#FFFFFF" />
android:background="#FFFFFF"
android:contentDescription="Bar chart of the harassment percentages."/>

</RelativeLayout>

Expand All @@ -58,6 +60,7 @@
android:layout_marginStart="10dp"
app:materialIcon="arrow_left_bold"
app:materialIconColor="#ffffff"
android:contentDescription="Button to go back to pie chart"
/>

<TextView
Expand Down
3 changes: 2 additions & 1 deletion starter-code/app/src/main/res/layout/custom_toast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/smallwhitelogo"
android:paddingTop="10dp" />
android:paddingTop="10dp"
android:contentDescription="Thumbs down image logo"/>
</LinearLayout>
</LinearLayout>
3 changes: 2 additions & 1 deletion starter-code/app/src/main/res/layout/map_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
android:layout_weight="3"
android:text="Filter"
android:textStyle="bold"
android:textColor="@color/primary" />
android:textColor="@color/primary"
android:contentDescription="Filter the search results"/>

<ImageView
android:layout_width="0dp"
Expand Down
4 changes: 3 additions & 1 deletion starter-code/app/src/main/res/layout/pie_chart_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<com.github.mikephil.charting.charts.PieChart
android:id="@+id/pie_chart"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:contentDescription="Pie chart of the percentages of the types of harassment."/>

</RelativeLayout>

Expand Down Expand Up @@ -68,6 +69,7 @@
android:layout_marginEnd="15dp"
app:materialIcon="arrow_right_bold"
app:materialIconColor="#ffffff"
android:contentDescription="Button to go to next chart"
/>

</RelativeLayout>
Expand Down
39 changes: 26 additions & 13 deletions starter-code/app/src/main/res/layout/profile_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
android:maxLength="4"
android:textColor="#000000"
android:textColorHint="#363636"
android:focusable="true"/>
android:focusable="true"
android:contentDescription="Enter the year of your birth. Edit text box."/>
</android.support.design.widget.TextInputLayout>

</LinearLayout>
Expand All @@ -98,7 +99,8 @@
android:layout_marginTop="16dp"
android:text="@string/alert_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:contentDescription="Check off if you want notifications when entering areas with high harassment reports."/>

</LinearLayout>

Expand Down Expand Up @@ -132,7 +134,8 @@
style="@style/toggle_button"
android:layout_marginRight="3dp"
android:textOff="Man"
android:textOn="Man" />
android:textOn="Man"
android:contentDescription="Select if you are a man"/>

<ToggleButton
android:id="@+id/woman"
Expand All @@ -142,7 +145,8 @@
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:textOff="Woman"
android:textOn="Woman" />
android:textOn="Woman"
android:contentDescription="Select if you are a woman."/>

<ToggleButton
android:id="@+id/lesbian"
Expand All @@ -151,7 +155,8 @@
style="@style/toggle_button"
android:layout_marginLeft="3dp"
android:textOff="Lesbian"
android:textOn="Lesbian" />
android:textOn="Lesbian"
android:contentDescription="Select if you are Lesbian"/>

</LinearLayout>

Expand All @@ -169,7 +174,8 @@
style="@style/toggle_button"
android:layout_marginRight="3dp"
android:textOff="Person of Color"
android:textOn="Person of Color" />
android:textOn="Person of Color"
android:contentDescription="Select if you are a person of color"/>

<ToggleButton
android:id="@+id/trans"
Expand All @@ -178,7 +184,8 @@
style="@style/toggle_button"
android:layout_marginLeft="3dp"
android:textOff="Transgender"
android:textOn="Transgender" />
android:textOn="Transgender"
android:contentDescription="Select if you are transgender"/>

</LinearLayout>

Expand All @@ -196,7 +203,8 @@
style="@style/toggle_button"
android:layout_marginRight="3dp"
android:textOff="Gay"
android:textOn="Gay" />
android:textOn="Gay"
android:contentDescription="Select if you are gay"/>

<ToggleButton
android:id="@+id/bisexual"
Expand All @@ -206,7 +214,8 @@
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:textOff="Bisexual"
android:textOn="Bisexual" />
android:textOn="Bisexual"
android:contentDescription="Select if you are bi"/>

<ToggleButton
android:id="@+id/minor"
Expand All @@ -215,7 +224,8 @@
style="@style/toggle_button"
android:layout_marginLeft="3dp"
android:textOff="Minor"
android:textOn="Minor" />
android:textOn="Minor"
android:contentDescription="Select if you are a minor"/>

</LinearLayout>

Expand All @@ -233,7 +243,8 @@
style="@style/toggle_button"
android:layout_marginRight="3dp"
android:textOff="Queer"
android:textOn="Queer" />
android:textOn="Queer"
android:contentDescription="Select if you are a queer"/>

<ToggleButton
android:id="@+id/other"
Expand All @@ -242,7 +253,8 @@
style="@style/toggle_button"
android:layout_marginLeft="3dp"
android:textOff="Other"
android:textOn="Other" />
android:textOn="Other"
android:contentDescription="Select if you consider yourself any other category"/>

</LinearLayout>
</LinearLayout>
Expand All @@ -258,6 +270,7 @@
android:textSize="15dp"
android:padding="20dp"
style="@style/button"
android:layout_weight="2"/>
android:layout_weight="2"
android:contentDescription="Log out button."/>
</LinearLayout>
</ScrollView>
3 changes: 3 additions & 0 deletions starter-code/app/src/main/res/layout/signup_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
android:background="@android:color/transparent"
android:id="@+id/facebook_button"
android:src="@drawable/facebook"
android:contentDescription="Sign up with your Facebook account"
/>

<ImageButton
Expand All @@ -81,6 +82,7 @@
android:id="@+id/twitter_button"
android:src="@drawable/twitter"
android:background="@android:color/transparent"
android:contentDescription="Sign up with your Twitter account"
/>

<ImageButton
Expand All @@ -90,6 +92,7 @@
android:layout_weight="1"
android:src="@drawable/google"
android:background="@android:color/transparent"
android:contentDescription="Sign up with your Google Plus account"
/>

</LinearLayout>
Expand Down
6 changes: 4 additions & 2 deletions starter-code/app/src/main/res/layout/stats_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="4"
android:text="General Overview" />
android:text="General Overview"
android:contentDescription="See the general overview"/>

<ImageView
android:layout_width="0dp"
Expand All @@ -39,7 +40,8 @@
android:inputType="number"
android:maxLength="5"
android:textSize="18sp"
android:focusable="true"/>
android:focusable="true"
android:contentDescription="Enter your zip code."/>

</LinearLayout>

Expand Down