Added title and minor ux improvements

saulmm · Feb 7, 2016 · 00e1b9d · 00e1b9d
1 parent 699eeb8
commit 00e1b9d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/app/src/main/java/saulmm/avengers/mvp/presenters/CharacterDetailPresenter.java b/app/src/main/java/saulmm/avengers/mvp/presenters/CharacterDetailPresenter.java
@@ -31,8 +31,8 @@ public void onCreate() {
         if (mCharacterId == -1 || mCharacterName == null)
             throw new IllegalStateException();
 
-        askForCharacterDetails();
         mCharacterDetailView.disableScroll();
+        askForCharacterDetails();
     }
 
     public void askForCharacterDetails() {
@@ -71,7 +71,9 @@ private void manageCharacterError(Throwable error) {
 
     private void onCharacterReceived(MarvelCharacter character) {
         mCharacterDetailView.bindCharacter(character);
-        mCharacterDetailView.enableScroll();
+
+        if (character.getDescription() != null && !character.getDescription().equals(""))
+            mCharacterDetailView.enableScroll();
     }
 
     public void onComicsIndicatorPressed() {

diff --git a/app/src/main/java/saulmm/avengers/views/activities/CharacterDetailActivity.java b/app/src/main/java/saulmm/avengers/views/activities/CharacterDetailActivity.java
@@ -195,9 +195,6 @@ public void hideRevealViewByAlpha() {
     }
 
     private void initToolbar() {
-        mBinding.characterCollapsing.setExpandedTitleTextAppearance(
-            R.style.Text_CollapsedExpanded);
-
         mBinding.characterToolbar.setNavigationOnClickListener(v -> onBackPressed());
     }
 
@@ -213,7 +210,6 @@ public void showError(String errorMessage) {
     @Override
     public void bindCharacter(MarvelCharacter character) {
         mBinding.setCharacter(character);
-        enableScroll();
     }
 
     @Override

diff --git a/app/src/main/res/drawable/gradient_dark_up.xml b/app/src/main/res/drawable/gradient_dark_up.xml
@@ -3,8 +3,8 @@
 
     <gradient
         android:angle="90"
-        android:startColor="#262626"
-        android:centerColor="#22000000"
-        android:endColor="#00414141"
+        android:startColor="#AA000000"
+        android:centerColor="#66000000"
+        android:endColor="#00000000"
         />
 </shape>
diff --git a/app/src/main/res/layout/activity_avenger_detail.xml b/app/src/main/res/layout/activity_avenger_detail.xml
@@ -53,15 +53,23 @@
                     callback="@{imageCallback}"
                     source="@{character.imageUrl}"
                     tools:ignore="ContentDescription"
+                    android:foreground="@drawable/gradient_dark_up"
                     />
 
+
                 <View
                     android:id="@+id/character_image_reveal"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     tools:background="#dc6767"
                     />
 
+                <!--<View-->
+                    <!--android:layout_width="match_parent"-->
+                    <!--android:layout_height="match_parent"-->
+                    <!--android:background="@drawable/gradient_dark_up"-->
+                    <!--/>-->
+
 				<android.support.v7.widget.Toolbar
 					android:id="@+id/character_toolbar"
 					android:layout_width="match_parent"
@@ -72,7 +80,6 @@
 					app:layout_collapseMode="pin"
 					android:background="@null"
 					/>
-
 			</android.support.design.widget.CollapsingToolbarLayout>
 
 

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -42,11 +42,10 @@
         <item name="android:minHeight">0dp</item>
     </style>
 
-    <style name="Text.CollapsedExpanded">
+    <style name="Text.Expanded">
         <item name="android:gravity">center_horizontal</item>
-        <item name="android:textColor">@android:color/transparent</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textSize">24sp</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
+        <item name="android:textSize">30sp</item>
     </style>
 
     <style name="Text.Counters">

diff --git a/domain/src/main/java/saulmm/avengers/CharacterDetailsUsecase.java b/domain/src/main/java/saulmm/avengers/CharacterDetailsUsecase.java
@@ -32,10 +32,6 @@ public class CharacterDetailsUsecase extends Usecase<MarvelCharacter> {
 
     @Override
     public Observable<MarvelCharacter> buildObservable() {
-        mRepository.getCharacters(0)
-                .observeOn(mUiThread)
-                .subscribeOn(mExecutorThread);
-
         return mRepository.getCharacter(mCharacterId)
             .observeOn(mUiThread)
             .subscribeOn(mExecutorThread);