kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1523 Wrap content appropriately

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-09-26 11:47:18 +01:00
parent cca60df69f
commit 2934c16d37
2 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/res/layout/content_main.xml
View File

@ -2,14 +2,12 @@
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/get_content_card" android:id="@+id/get_content_card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/content_main_card" android:id="@+id/content_main_card"
@ -19,13 +17,11 @@
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
>
<ImageView <ImageView
android:id="@+id/content_main_card_image" android:id="@+id/content_main_card_image"
@ -37,8 +33,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
/>
<!-- constraintRight_toRightOf is used as android:layoutDirection is supported from API 17 --> <!-- constraintRight_toRightOf is used as android:layoutDirection is supported from API 17 -->
<androidx.appcompat.widget.AppCompatButton <androidx.appcompat.widget.AppCompatButton
@ -50,21 +45,19 @@
android:textColor="@android:color/white" android:textColor="@android:color/white"
app:backgroundTint="#1565c0" app:backgroundTint="#1565c0"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent" />
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="@id/content_main_card"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/content_main_card" app:layout_constraintTop_toBottomOf="@id/content_main_card" />
/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

85
app/src/main/res/layout/item_book.xml
View File

@ -4,26 +4,34 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="0dp" android:animateLayoutChanges="true"
android:paddingLeft="0dp" tools:ignore="Overdraw">
android:paddingRight="0dp"
android:paddingStart="@dimen/activity_horizontal_margin" <androidx.constraintlayout.widget.Guideline
android:paddingTop="@dimen/activity_vertical_margin" android:id="@+id/horizontal_padding"
tools:ignore="Overdraw" android:layout_width="wrap_content"
> android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="@dimen/activity_horizontal_margin" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/vertical_padding"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_begin="@dimen/activity_vertical_margin" />
<CheckBox <CheckBox
android:id="@+id/itemBookCheckbox" android:id="@+id/itemBookCheckbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:paddingRight="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:paddingRight="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/horizontal_padding"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlSymmetry" tools:ignore="RtlSymmetry" />
/>
<ImageView <ImageView
android:id="@+id/item_book_icon" android:id="@+id/item_book_icon"
@ -33,21 +41,20 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/itemBookCheckbox" app:layout_constraintStart_toEndOf="@id/itemBookCheckbox"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@mipmap/kiwix_icon_round" tools:src="@mipmap/kiwix_icon_round" />
/>
<TextView <TextView
android:id="@+id/item_book_title" android:id="@+id/item_book_title"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:textColor="@color/textDarkPrimary" android:textColor="@color/textDarkPrimary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/item_book_icon" app:layout_constraintStart_toEndOf="@id/item_book_icon"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/vertical_padding"
tools:text="Wikipedia" tools:text="Wikipedia" />
/>
<TextView <TextView
android:id="@+id/item_book_date" android:id="@+id/item_book_date"
@ -56,75 +63,69 @@
android:textColor="@color/textDarkSecondary" android:textColor="@color/textDarkSecondary"
app:layout_constraintStart_toStartOf="@id/item_book_title" app:layout_constraintStart_toStartOf="@id/item_book_title"
app:layout_constraintTop_toBottomOf="@id/item_book_title" app:layout_constraintTop_toBottomOf="@id/item_book_title"
tools:text="1 Jan 2018" tools:text="1 Jan 2018" />
/>
<TextView <TextView
android:id="@+id/item_book_size" android:id="@+id/item_book_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:textColor="@color/textDarkSecondary" android:textColor="@color/textDarkSecondary"
app:layout_constraintStart_toEndOf="@id/item_book_date" app:layout_constraintStart_toEndOf="@id/item_book_date"
app:layout_constraintTop_toTopOf="@id/item_book_date" app:layout_constraintTop_toTopOf="@id/item_book_date"
tools:text="20 GB" tools:text="20 GB" />
/>
<TextView <TextView
android:id="@+id/item_book_article_count" android:id="@+id/item_book_article_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:textColor="@color/textDarkSecondary" android:textColor="@color/textDarkSecondary"
app:layout_constraintStart_toEndOf="@id/item_book_size" app:layout_constraintStart_toEndOf="@id/item_book_size"
app:layout_constraintTop_toTopOf="@id/item_book_size" app:layout_constraintTop_toTopOf="@id/item_book_size"
tools:text="10.1 K articles" tools:text="10.1 K articles" />
/>
<TextView <TextView
android:id="@+id/item_book_description" android:id="@+id/item_book_description"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/textDarkSecondary"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:textColor="@color/textDarkSecondary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/item_book_title" app:layout_constraintStart_toStartOf="@id/item_book_title"
app:layout_constraintTop_toBottomOf="@id/item_book_date" app:layout_constraintTop_toBottomOf="@id/item_book_date"
tools:text="All wikipedia articles" tools:text="All wikipedia articles" />
/>
<TextView <TextView
android:id="@+id/item_book_label_picture" android:id="@+id/item_book_label_picture"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/border_label_picture" android:background="@drawable/border_label_picture"
android:paddingEnd="6dp"
android:paddingStart="6dp" android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/pic" android:text="@string/pic"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/picture_label" android:textColor="@color/picture_label"
app:layout_constraintStart_toStartOf="@id/item_book_title" app:layout_constraintStart_toStartOf="@id/item_book_title"
app:layout_constraintTop_toBottomOf="@id/item_book_description" app:layout_constraintTop_toBottomOf="@id/item_book_description" />
/>
<TextView <TextView
android:id="@+id/item_book_label_video" android:id="@+id/item_book_label_video"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/border_label_video" android:background="@drawable/border_label_video"
android:paddingEnd="6dp"
android:paddingStart="6dp" android:paddingStart="6dp"
android:paddingEnd="6dp"
android:text="@string/vid" android:text="@string/vid"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/video_label" android:textColor="@color/video_label"
app:layout_constraintStart_toEndOf="@id/item_book_label_picture" app:layout_constraintStart_toEndOf="@id/item_book_label_picture"
app:layout_constraintTop_toTopOf="@id/item_book_label_picture" app:layout_constraintTop_toTopOf="@id/item_book_label_picture" />
/>
<View <View
android:layout_width="0dp" android:layout_width="0dp"
@ -132,16 +133,16 @@
android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginTop="@dimen/activity_vertical_margin"
android:background="?android:attr/dividerVertical" android:background="?android:attr/dividerVertical"
app:layout_constraintStart_toStartOf="@id/item_book_title" app:layout_constraintStart_toStartOf="@id/item_book_title"
app:layout_constraintTop_toBottomOf="@id/item_book_label_picture" app:layout_constraintTop_toBottomOf="@id/item_book_label_picture" />
/>
<View <View
android:background="?android:attr/selectableItemBackground"
android:id="@+id/item_book_clickable_area" android:id="@+id/item_book_clickable_area"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent" android:background="?android:attr/selectableItemBackground"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
/> app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>