Use material card view

premnirmal · Jul 24, 2022 · 154f9f6 · 154f9f6
1 parent 1008b62
commit 154f9f6
Show file tree

Hide file tree

Showing 16 changed files with 153 additions and 99 deletions.
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/news/NewsFeedFragment.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/news/NewsFeedFragment.kt
@@ -22,14 +22,15 @@ import com.github.premnirmal.tickerwidget.R.dimen
 import com.github.premnirmal.tickerwidget.databinding.FragmentNewsFeedBinding
 
 class NewsFeedFragment : BaseFragment<FragmentNewsFeedBinding>(), ChildFragment, NewsFeedAdapter.NewsClickListener {
-	override val binding: (FragmentNewsFeedBinding) by viewBinding(FragmentNewsFeedBinding::inflate)
+
   companion object {
     private const val INDEX_PROGRESS = 0
     private const val INDEX_ERROR = 1
     private const val INDEX_EMPTY = 2
     private const val INDEX_DATA = 3
   }
 
+  override val binding: (FragmentNewsFeedBinding) by viewBinding(FragmentNewsFeedBinding::inflate)
   private lateinit var adapter: NewsFeedAdapter
   private val viewModel: NewsFeedViewModel by viewModels()
   override val simpleName: String

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/news/QuoteDetailActivity.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/news/QuoteDetailActivity.kt
@@ -43,6 +43,7 @@ import com.github.premnirmal.ticker.ui.SpacingDecoration
 import com.github.premnirmal.ticker.viewBinding
 import com.github.premnirmal.ticker.widget.WidgetDataProvider
 import com.github.premnirmal.tickerwidget.R
+import com.github.premnirmal.tickerwidget.R.dimen
 import com.github.premnirmal.tickerwidget.databinding.ActivityQuoteDetailBinding
 import com.google.android.material.appbar.AppBarLayout
 import com.robinhood.ticker.TickerUtils

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/PortfolioFragment.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/PortfolioFragment.kt
@@ -107,7 +107,7 @@ class PortfolioFragment : BaseFragment<FragmentPortfolioBinding>(), ChildFragmen
   ) {
     super.onViewCreated(view, savedInstanceState)
     binding.stockList.addItemDecoration(
-        SpacingDecoration(requireContext().resources.getDimensionPixelSize(R.dimen.list_spacing))
+        SpacingDecoration(requireContext().resources.getDimensionPixelSize(R.dimen.list_spacing_double))
     )
     val gridLayoutManager = androidx.recyclerview.widget.GridLayoutManager(context, 2)
     binding.stockList.layoutManager = gridLayoutManager

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchFragment.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/portfolio/search/SearchFragment.kt
@@ -112,11 +112,14 @@ class SearchFragment : BaseFragment<FragmentSearchBinding>(), ChildFragment, Sug
     })
   }
 
-  override fun onHiddenChanged(hidden: Boolean) {
-    super.onHiddenChanged(hidden)
-    if (hidden) dismissKeyboard() else {
-      binding.searchView.showKeyboard()
-    }
+  override fun onResume() {
+    super.onResume()
+    binding.searchView.showKeyboard()
+  }
+
+  override fun onPause() {
+    super.onPause()
+    dismissKeyboard()
   }
 
   override fun onSaveInstanceState(outState: Bundle) {

diff --git a/app/src/main/res/layout-land/activity_quote_detail.xml b/app/src/main/res/layout-land/activity_quote_detail.xml
@@ -266,14 +266,16 @@
               />
 
         </LinearLayout>
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/positions_container"
             android:visibility="gone"
             tools:visibility="visible"
-            android:layout_margin="8dp"
-            android:background="@drawable/card_bg"
+            android:layout_margin="8dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             >
 
@@ -375,7 +377,7 @@
               />
 
         </LinearLayout>
-
+        </com.google.android.material.card.MaterialCardView>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -406,13 +408,16 @@
               />
         </LinearLayout>
 
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/alerts_container"
             android:visibility="gone"
-            android:layout_margin="8dp"
-            android:background="@drawable/card_bg"
+            tools:visibility="visible"
+            android:layout_margin="8dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             >
 
@@ -441,7 +446,7 @@
               />
 
         </LinearLayout>
-
+        </com.google.android.material.card.MaterialCardView>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout-sw600dp-land/activity_quote_detail.xml b/app/src/main/res/layout-sw600dp-land/activity_quote_detail.xml
@@ -268,13 +268,17 @@
               />
 
         </LinearLayout>
-        <LinearLayout
+        <com.google.android.material.card.MaterialCardView
             app:layout_constraintTop_toBottomOf="@id/positions_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:id="@+id/positions_container"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:layout_margin="8dp">
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="@drawable/card_bg"
             android:orientation="vertical"
             >
 
@@ -378,7 +382,7 @@
               />
 
         </LinearLayout>
-
+        </com.google.android.material.card.MaterialCardView>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -410,15 +414,18 @@
               />
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/alerts_container"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:background="@drawable/card_bg"
-            android:orientation="vertical"
+            android:id="@+id/alerts_container"
             android:visibility="gone"
+            tools:visibility="visible"
             app:layout_constraintTop_toBottomOf="@id/alert_header"
+            android:layout_margin="8dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
             >
 
           <com.github.premnirmal.ticker.ui.StockFieldView
@@ -446,7 +453,7 @@
               />
 
         </LinearLayout>
-
+        </com.google.android.material.card.MaterialCardView>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/activity_positions.xml b/app/src/main/res/layout/activity_positions.xml
@@ -162,11 +162,14 @@
           android:textSize="@dimen/thin_title_text"
           />
 
+
+      <com.google.android.material.card.MaterialCardView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_margin="8dp">
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_margin="8dp"
-          android:background="@drawable/card_bg"
           android:orientation="vertical"
           android:padding="16dp"
           >
@@ -271,7 +274,7 @@
         </LinearLayout>
 
       </LinearLayout>
-
+      </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
   </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_quote_detail.xml b/app/src/main/res/layout/activity_quote_detail.xml
@@ -273,14 +273,17 @@
             />
 
       </LinearLayout>
-      <LinearLayout
+
+      <com.google.android.material.card.MaterialCardView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:id="@+id/positions_container"
           android:visibility="gone"
           tools:visibility="visible"
-          android:layout_margin="8dp"
-          android:background="@drawable/card_bg"
+          android:layout_margin="8dp">
+      <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
           android:orientation="vertical"
           >
 
@@ -382,7 +385,7 @@
             />
 
       </LinearLayout>
-
+      </com.google.android.material.card.MaterialCardView>
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -414,13 +417,18 @@
             />
       </LinearLayout>
 
-      <LinearLayout
+
+      <com.google.android.material.card.MaterialCardView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:id="@+id/alerts_container"
           android:visibility="gone"
+          tools:visibility="visible"
+          android:layout_margin="8dp">
+      <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
           android:layout_margin="8dp"
-          android:background="@drawable/card_bg"
           android:orientation="vertical"
           >
 
@@ -449,6 +457,7 @@
             />
 
       </LinearLayout>
+      </com.google.android.material.card.MaterialCardView>
 
       <LinearLayout
           android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/fragment_news_feed.xml b/app/src/main/res/layout/fragment_news_feed.xml
@@ -3,13 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
     >
 
   <com.google.android.material.appbar.AppBarLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-
       android:elevation="0dp"
       app:elevation="0dp"
       >
@@ -44,6 +42,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/view_flipper"
+        android:background="?attr/colorSurface"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
@@ -60,7 +59,7 @@
           android:gravity="center"
           android:text="@string/error_fetching_news"
           style="@style/Widget.StocksWidget.TextView.FetchError"
-	android:textAppearance="@style/TextAppearance.StocksWidget.FetchError"
+	        android:textAppearance="@style/TextAppearance.StocksWidget.FetchError"
           />
 
       <TextView
@@ -70,7 +69,7 @@
           android:gravity="center"
           android:text="@string/no_data"
           style="@style/Widget.StocksWidget.TextView.FetchError"
-	android:textAppearance="@style/TextAppearance.StocksWidget.FetchError"
+	        android:textAppearance="@style/TextAppearance.StocksWidget.FetchError"
           />
 
       <androidx.recyclerview.widget.RecyclerView