diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt index 016dc7098e..de80c31996 100644 --- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt +++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt @@ -4,8 +4,10 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import com.bumptech.glide.Glide import im.vector.riotredesign.R import im.vector.riotredesign.core.platform.RiotFragment +import kotlinx.android.synthetic.main.fragment_loading_room_detail.* class LoadingRoomDetailFragment : RiotFragment() { @@ -20,5 +22,12 @@ class LoadingRoomDetailFragment : RiotFragment() { return inflater.inflate(R.layout.fragment_loading_room_detail, container, false) } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + Glide.with(this) + .load(R.drawable.riot_splash) + .into(animatedLogoImageView) + } + } \ No newline at end of file diff --git a/app/src/main/res/drawable/riot_splash.gif b/app/src/main/res/drawable/riot_splash.gif new file mode 100644 index 0000000000..6da2541f91 Binary files /dev/null and b/app/src/main/res/drawable/riot_splash.gif differ diff --git a/app/src/main/res/layout/fragment_loading_room_detail.xml b/app/src/main/res/layout/fragment_loading_room_detail.xml index d85e483bb2..26dedc74e2 100644 --- a/app/src/main/res/layout/fragment_loading_room_detail.xml +++ b/app/src/main/res/layout/fragment_loading_room_detail.xml @@ -4,17 +4,26 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <!-- Note: Gif will be loaded by the code --> + <ImageView + android:id="@+id/animatedLogoImageView" + android:layout_width="240dp" + android:layout_height="240dp" + app:layout_constraintBottom_toTopOf="@+id/progressBar" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" /> + <ProgressBar android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" + android:layout_centerInParent="true" + android:indeterminate="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/animatedLogoImageView" /> -</android.support.constraint.ConstraintLayout> \ No newline at end of file +</android.support.constraint.ConstraintLayout>