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

Jump to bottom

Fixes #1211: CompletedStoryList - Tablet (Landscape) (Highfi) #1569

Merged
merged 7 commits into from
Aug 10, 2020
Merged

Fixes #1211: CompletedStoryList - Tablet (Landscape) (Highfi) #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
823b96f
-Implemented low-fi UI for "CompletedStoryList" for landscape mode - …
MohamedMedhat1998 Jun 27, 2020
80ef37f
-Implemented high-fi UI for "CompletedStoryList" for landscape mode -…
MohamedMedhat1998 Jun 28, 2020
50d0a70
-Fixed "completed_story_topic_name_text_view" text size
MohamedMedhat1998 Jun 28, 2020
f2e12fc
Merge remote-tracking branch 'origin/develop' into completed-story-ta…
MohamedMedhat1998 Aug 6, 2020
fa68f88
Merge remote-tracking branch 'origin/develop' into completed-story-ta…
MohamedMedhat1998 Aug 6, 2020
813f865
Merge remote-tracking branch 'origin/develop' into completed-story-ta…
MohamedMedhat1998 Aug 7, 2020
ed21c12
Merge branch 'develop' into completed-story-tablet-land-highfi
MohamedMedhat1998 Aug 10, 2020
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
17 changes: 7 additions & 10 deletions app/src/main/res/layout-sw600dp-land/completed_story_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
android:id="@+id/topic_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="12dp"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
android:layout_marginStart="32dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="32dp"
app:cardElevation="4dp"
app:cardCornerRadius="4dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -63,8 +62,7 @@
android:ellipsize="end"
android:fontFamily="sans-serif"
android:gravity="top"
android:maxLines="2"
android:minLines="2"
android:lines="2"
android:text="@{viewModel.completedStory.storyName}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="14sp"
Expand All @@ -81,13 +79,12 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:fontFamily="sans-serif-light"
android:maxLines="1"
android:minLines="1"
android:paddingBottom="12dp"
android:text="@{viewModel.completedStory.topicName}"
android:textAllCaps="true"
android:textColor="@color/oppiaStrokeBlack"
android:textSize="14sp"
android:lines="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/completed_story_name_text_view" />
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout-sw600dp-land/completed_story_list_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingStart="56dp"
android:paddingEnd="56dp"
android:paddingTop="28dp"
android:paddingBottom="88dp"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:paddingTop="24dp"
android:paddingBottom="112dp"
android:scrollbars="none"
android:tag="@string/completed_story_list_recyclerview_tag"
app:data="@{viewModel.completedStoryListLiveData}" />
Expand Down