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 #1154: Topic-info - Tablet (Landscape) (Lowfi) #1447

Merged
merged 2 commits into from
Jul 9, 2020
Merged

Fixes #1154: Topic-info - Tablet (Landscape) (Lowfi) #1447

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
0d0e384
-Implemented low-fi UI for "Topic-Info" for tablet - landscape mode
MohamedMedhat1998 Jul 7, 2020
bcf7661
Merge branch 'develop' into t-info-tablet-land-lowfi
MohamedMedhat1998 Jul 9, 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
77 changes: 77 additions & 0 deletions app/src/main/res/layout-sw600dp-land/topic_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

<variable
name="viewModel"
type="org.oppia.app.topic.TopicViewModel" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/topic_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:layout_constraintBottom_toTopOf="@+id/topic_tabs_viewpager_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<androidx.appcompat.widget.Toolbar
android:id="@+id/topic_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:fontFamily="sans-serif"
app:title="@{String.format(@string/topic_name, viewModel.topicNameLiveData)}"
android:minHeight="?attr/actionBarSize"
app:navigationContentDescription="@string/go_to_previous_page"
app:navigationIcon="?attr/homeAsUpIndicator"
app:titleTextAppearance="@style/ToolbarTextAppearance"
app:titleTextColor="@color/white" />

<com.google.android.material.tabs.TabLayout
android:id="@+id/topic_tabs_container"
style="@style/AppTabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
app:layout_constraintTop_toTopOf="parent"
app:tabBackground="@color/oppiaPrimaryDark"
app:tabGravity="fill"
app:tabIconTint="@color/tab_icon_color_selector"
app:tabIndicatorColor="@android:color/white"
app:tabIndicatorHeight="2dp"
app:tabMode="fixed"
app:tabTextAppearance="@style/AppTabTextAppearance"
app:tabTextColor="@color/tab_icon_color_selector" />
</com.google.android.material.appbar.AppBarLayout>

<FrameLayout
android:id="@+id/topic_tabs_viewpager_container"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topic_app_bar_layout">

<androidx.viewpager.widget.ViewPager
android:id="@+id/topic_tabs_viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

<View
android:id="@+id/topic_shadow_view"
android:layout_width="match_parent"
android:layout_height="6dp"
android:background="@drawable/toolbar_drop_shadow" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
142 changes: 142 additions & 0 deletions app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

<import type="android.view.View" />

<variable
name="viewModel"
type="org.oppia.app.topic.info.TopicInfoViewModel" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<ImageView
android:id="@+id/topic_thumbnail_image_view"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerInside"
android:src="@{viewModel.topic.topicThumbnail.thumbnailGraphic}"
android:background="@color/topicThumbnailBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline6"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/topic_name_text_view"
android:layout_width="@dimen/elevation_0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="120dp"
android:fontFamily="sans-serif"
android:text="@{viewModel.topic.name}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="24sp"
app:layout_constraintEnd_toStartOf="@+id/guideline6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

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

<TextView
android:id="@+id/topic_description_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:ellipsize="end"
android:fontFamily="sans-serif"
android:gravity="start"
android:maxLines="@{viewModel.isDescriptionExpanded() ? @integer/topic_description_expanded : @integer/topic_description_collapsed}"
android:text="@{viewModel.topicDescription}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/guideline6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/story_count_text_view" />

<TextView
android:id="@+id/see_more_text_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:minHeight="48dp"
android:onClick="@{(v) -> viewModel.clickSeeMore()}"
android:paddingTop="8dp"
android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="@{viewModel.isSeeMoreVisible() ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toStartOf="@+id/guideline6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/topic_description_text_view" />

<ImageView
android:id="@+id/download_status_image_view"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="32dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="32dp"
android:src="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/see_more_text_view" />

<TextView
android:id="@+id/download_story_count_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:fontFamily="sans-serif"
android:gravity="center_vertical"
android:text="@string/topic_downloaded"
android:textColor="@color/oppiaPrimaryText"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
app:layout_constraintStart_toEndOf="@+id/download_status_image_view"
app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />

<TextView
android:id="@+id/download_size_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="32dp"
android:fontFamily="sans-serif"
android:text="@{String.format(@string/topic_download_text, viewModel.topicSize)}"
android:textColor="@color/oppiaPrimaryText"
android:textSize="18sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
app:layout_constraintStart_toEndOf="@+id/download_story_count_text_view"
app:layout_constraintTop_toTopOf="@+id/download_status_image_view" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>