Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 03:11:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvments to MP4 giphy fragment behaviour.

Browse Source
This commit is contained in:
Alex Hart
2021-04-20 09:45:40 -03:00
committed by Greyson Parrelli
parent ed1be76606
commit e2e1200c89
16 changed files with 68 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/res/layout/giphy_activity.xml
View File

@@ -1,56 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:orientation="vertical">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/giphy_logo"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/giphy_logo"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary">
<org.thoughtcrime.securesms.giph.ui.GiphyActivityToolbar
android:id="@+id/giphy_toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarStyle"
app:layout_scrollFlags="scroll|enterAlways"/>
<com.google.android.material.tabs.TabLayout
app:tabBackground="@null"
app:tabTextColor="@color/signal_text_toolbar_subtitle"
app:tabSelectedTextColor="@color/signal_text_toolbar_title"
app:tabIndicatorColor="@color/signal_text_toolbar_title"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/TextSecure.Conversation.TabBar"
android:scrollbars="horizontal"/>
android:id="@+id/giphy_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="?attr/actionBarStyle"
app:layout_scrollFlags="scroll|enterAlways" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/giphy_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<ImageView android:id="@+id/giphy_logo"
android:src="@drawable/poweredby_giphy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:padding="10dp"
android:background="@color/black"/>
<ImageView
android:id="@+id/giphy_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/black"
android:padding="10dp"
android:src="@drawable/poweredby_giphy" />
</RelativeLayout>

2
app/src/main/res/layout/giphy_activity_toolbar.xml
View File

@@ -27,7 +27,7 @@
android:layout_width="0px"
android:layout_weight="1"
android:layout_marginStart="5dp"
android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
android:hint="@string/giphy_activity_toolbar__search_gifs"
android:textColor="@color/signal_text_toolbar_title"
android:textColorHint="@color/signal_text_toolbar_subtitle"
android:textCursorDrawable="@null"

27
app/src/main/res/layout/giphy_fragment.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/giphy_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"/>
<ProgressBar android:id="@+id/loading_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="visible"
android:indeterminate="true"/>
<TextView android:id="@+id/no_results"
android:text="@string/giphy_fragment__nothing_found"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_gravity="center"/>
</FrameLayout>

19
app/src/main/res/layout/giphy_mp4_fragment.xml
View File

@@ -5,11 +5,29 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Will Inject N VideoViews @ runtime -->
<FrameLayout
android:id="@+id/giphy_parent"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/content_loading"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true" />
<TextView
android:id="@+id/nothing_found"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/giphy_fragment__nothing_found"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/giphy_recycler"
android:layout_width="match_parent"
@@ -18,5 +36,4 @@
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/giphy_mp4" />
<!-- Will Inject N VideoViews @ runtime -->
</FrameLayout>

22
app/src/main/res/layout/giphy_thumbnail.xml
View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<org.thoughtcrime.securesms.giph.ui.AspectRatioImageView
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY" />
<ProgressBar android:id="@+id/gif_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="gone"
tools:visibility="visible"
android:layout_gravity="center"
android:gravity="center"/>
</FrameLayout>

2
app/src/main/res/values/strings.xml
View File

@@ -1993,7 +1993,7 @@
</plurals>
<!-- giphy_activity -->
<string name="giphy_activity_toolbar__search_gifs_and_stickers">Search GIFs and stickers</string>
<string name="giphy_activity_toolbar__search_gifs">Search GIFs</string>
<!-- giphy_fragment -->
<string name="giphy_fragment__nothing_found">Nothing found</string>