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 part #141: Hi-Fi Topic overview tab fragment #342

Merged
merged 9 commits into from
Nov 22, 2019
Merged

Fix part #141: Hi-Fi Topic overview tab fragment #342

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f670e27
Update topic_overview_fragment.xml
veena14cs Nov 14, 2019
2dffd08
Update topic_overview_fragment.xml
veena14cs Nov 14, 2019
0facf50
Update topic_overview_fragment.xml
veena14cs Nov 14, 2019
7585cb0
Merge branch 'develop' into hifi-topic-overview
veena14cs Nov 14, 2019
6dce935
Update ic_available_offline_primary_24dp.xml
veena14cs Nov 14, 2019
1d85ead
Update colors.xml
veena14cs Nov 14, 2019
6d02ee5
Merge branch 'develop' into hifi-topic-overview
veena14cs Nov 14, 2019
0f8d77b
Update ic_available_offline_primary_24dp.xml
veena14cs Nov 14, 2019
0be6b0d
Update topic_overview_fragment.xml
veena14cs Nov 15, 2019
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
47 changes: 25 additions & 22 deletions app/src/main/res/layout/topic_overview_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,55 +40,58 @@
app:rectangleDrawableWithColor="@{viewModel.topic.topicThumbnail.backgroundColorRgb}"
android:src="@{viewModel.topic.topicThumbnail.thumbnailGraphic}" />


<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="200dp"
android:background="@drawable/thumbnail_gradient" />
</FrameLayout>

<TextView
android:id="@+id/topic_name_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:gravity="start"
android:text="@{viewModel.topic.name}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topic_thumbnail_frame_layout" />
<TextView
android:id="@+id/topic_name_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:text="@{viewModel.topic.name}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="24sp" />

</FrameLayout>

<TextView
android:id="@+id/story_count_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:text="@{@plurals/story_count(viewModel.topic.storyCount, viewModel.topic.storyCount)}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topic_name_text_view"/>
app:layout_constraintTop_toBottomOf="@+id/topic_thumbnail_frame_layout" />

<TextView
android:id="@+id/topic_description_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:text="@{viewModel.topic.description}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/story_count_text_view"/>
app:layout_constraintTop_toBottomOf="@+id/story_count_text_view" />
<TextView
android:id="@+id/see_more_text_view"
android:layout_width="wrap_content"
Expand Down