From c8a9c848d5274c17d21d6131c441d065c7ec0775 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 12 Apr 2019 15:44:53 +0200 Subject: [PATCH] Improve UI --- .../android/ui/fragment/HistoryFragment.kt | 13 ++--- app/src/main/res/layout/fragment_history.xml | 56 ++++++++++--------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt index 78b61b06..59c01ec9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.core.view.isVisible +import androidx.interpolator.view.animation.FastOutSlowInInterpolator import io.realm.RealmResults import io.realm.Sort import io.realm.kotlin.where @@ -56,12 +57,6 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource realmSessions.removeAllChangeListeners() } - override fun onResume() { - super.onResume() - // Old - //createSessionsHeaders() - } - /** * Init UI */ @@ -96,7 +91,11 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource disclaimerDismiss.setOnClickListener { Preferences.setStopShowingDisclaimer(requireContext()) - disclaimerContainer.isVisible = false + + disclaimerContainer.animate().translationY(disclaimerContainer.height.toFloat()) + .setInterpolator(FastOutSlowInInterpolator()) + .withEndAction { disclaimerContainer?.isVisible = false } + .start() } } diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 317fb5a3..6177771c 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -53,51 +53,53 @@ + app:layout_constraintVertical_bias="0.5" + tools:visibility="visible" /> + android:id="@+id/disclaimerContainer" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:background="@color/green_darker" + android:orientation="vertical" + android:padding="24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:layout_marginBottom="8dp" + android:text="@string/disclaimer" + android:textSize="18sp" + tools:visibility="visible" /> + android:id="@+id/disclaimerDismiss" + style="@style/PokerAnalyticsTheme.Button" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:text="@string/iunderstand" />