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

Fix Issues #102 and #106 #108

Closed
wants to merge 2 commits into from
Closed

Fix Issues #102 and #106 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e9515
Fix Issue #102
May 19, 2018
ecc1373
Fix Issue #106
May 19, 2018
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
9 changes: 6 additions & 3 deletions app/src/main/res/layout/activity_food_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:nestedScrollingEnabled="false">

<android.support.v7.widget.CardView
android:layout_width="match_parent"
Expand Down Expand Up @@ -84,7 +85,8 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/food_serving_sizes"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"/>

</LinearLayout>

Expand All @@ -111,7 +113,8 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/food_types"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"/>

</LinearLayout>

Expand Down
8 changes: 4 additions & 4 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 @@ -68,7 +68,7 @@
<string name="food_history">Food History</string>
<string name="icon_info" translatable="false">{fa-info-circle 12dp @color/gray}</string>
<string name="icon_calendar" translatable="false">{fa-calendar 16dp @color/gray_dark}</string>
<string name="num_servings_max" translatable="false">24</string>
<string name="num_servings_max" translatable="false">26</string>
<string name="icon_chart" translatable="false">{fa-bar-chart 20dp @color/gray_dark}</string>
<string name="daily_servings_history">Daily Servings History</string>
<string name="no_servings_recorded">You have not recorded any servings yet!</string>
Expand Down Expand Up @@ -193,7 +193,7 @@
<item>1</item>
<item>3</item>
<item>5</item>
<item>1</item>
<item>3</item>
<item>1</item>
<item>1</item>
</integer-array>
Expand Down Expand Up @@ -676,8 +676,8 @@
</string-array>

<string-array name="food_info_serving_sizes_exercise">
<item>%s90 minutes of moderate-intensity activity</item>
<item>%s40 minutes of vigorous-intensity activity</item>
<item>%s30 minutes of moderate-intensity activity</item>
<item>%s14 minutes of vigorous-intensity activity</item>
</string-array>

<string-array name="food_info_serving_sizes_exercise_imperial">
Expand Down