refactor: Adds release build apk & refactors code

Haid-Faiz · Oct 31, 2021 · 02b3818 · 02b3818
1 parent 9318bcf
commit 02b3818
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 21 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 31
         versionCode 2
-        versionName "v2.0"
+        versionName "v2.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -102,4 +102,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
+}
diff --git a/app/release/news_land_v2.0.0.apk b/app/release/news_land_v2.0.0.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 2,
-      "versionName": "v2.0",
+      "versionName": "v2.0.0",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/example/newsapp/ui/MainActivity.kt b/app/src/main/java/com/example/newsapp/ui/MainActivity.kt
@@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity() {
 
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                 // Running Android OS version is less than Android 10 i.e. Android Q
-                _isNightMode = it ?: false   // Updating _isNightMode value
+                _isNightMode = it ?: false // Updating _isNightMode value
                 if (_isNightMode)
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
                 else

diff --git a/app/src/main/java/com/example/newsapp/ui/feed/NewsListFragment.kt b/app/src/main/java/com/example/newsapp/ui/feed/NewsListFragment.kt
@@ -83,8 +83,8 @@ class NewsListFragment : Fragment() {
             header = PagingErrorAdapter { adapter.retry() },
             footer = PagingErrorAdapter { adapter.retry() }
         )
-        adapter.addLoadStateListener {
-            when (it.refresh) {
+        adapter.addLoadStateListener { loadStates ->
+            when (loadStates.refresh) {
                 is LoadState.NotLoading -> {
                     binding.apply {
                         newsListRecyclerview.isVisible = true
@@ -103,13 +103,13 @@ class NewsListFragment : Fragment() {
                     }
                 }
                 is LoadState.Error -> {
-                    handleExceptions((it.refresh as LoadState.Error).error)
                     binding.apply {
                         newsListRecyclerview.isVisible = false
                         statusBox.isVisible = true
                         shimmerProgress.stopShimmer()
                         shimmerProgress.isVisible = false
                     }
+                    handleExceptions((loadStates.refresh as LoadState.Error).error)
                 }
             }
         }

diff --git a/app/src/main/java/com/example/newsapp/utils/Extensions.kt b/app/src/main/java/com/example/newsapp/utils/Extensions.kt
@@ -36,8 +36,8 @@ fun TextView.formatDate(article: Article) {
     this.text = timeAgo
 }
 
-fun View.showSnackBar(message: String, retryFun: (() -> Unit)? = null) {
-    Snackbar.make(this, message, Snackbar.LENGTH_LONG).show()
+fun View?.showSnackBar(message: String, retryFun: (() -> Unit)? = null) {
+    this?.let { Snackbar.make(it, message, Snackbar.LENGTH_LONG).show() }
 }
 
 // fun Fragment.handleApiError(failure: Resource.Error) {
@@ -51,6 +51,6 @@ fun View.showSnackBar(message: String, retryFun: (() -> Unit)? = null) {
 fun Fragment.handleExceptions(throwable: Throwable) {
     when (throwable) {
         is HttpException -> view?.showSnackBar("Oops.. Something went wrong !")
-        is IOException -> view?.showSnackBar("Please check your internet connection")
+        is IOException -> this.view?.showSnackBar("Please check your internet connection")
     }
 }
diff --git a/app/src/main/res/layout/fragment_news_list.xml b/app/src/main/res/layout/fragment_news_list.xml
@@ -25,8 +25,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
+
             <include layout="@layout/news_list_item_shimmer" />
+
             <include layout="@layout/news_list_item_shimmer" />
+
             <include layout="@layout/news_list_item_shimmer" />
         </LinearLayout>
 
@@ -38,6 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/_72sdp"
         android:orientation="vertical"
+        android:layout_marginTop="@dimen/_24sdp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -60,10 +64,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/_16sdp"
             android:layout_marginStart="@dimen/_16sdp"
+            android:layout_marginTop="@dimen/_8sdp"
             android:layout_marginEnd="@dimen/_16sdp"
-            android:layout_marginBottom="@dimen/_12sdp"
+            android:layout_marginBottom="@dimen/_24sdp"
             android:fontFamily="@font/montserrat"
             android:gravity="center_horizontal"
             android:text="You didn't bookmarked anything yet !"
@@ -73,17 +77,17 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/retry_button"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_gravity="center_horizontal"
+            android:fontFamily="@font/open_sans"
+            android:text="Retry"
             android:textAllCaps="false"
-            android:visibility="invisible"
             android:textColor="@color/primary_text"
-            android:fontFamily="@font/open_sans"
+            android:visibility="invisible"
             app:strokeColor="@color/shimmerColor"
-            tools:visibility="visible"
-            android:layout_gravity="center_horizontal"
-            android:text="Retry" />
+            tools:visibility="visible" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/page_error_item.xml b/app/src/main/res/layout/page_error_item.xml
@@ -21,7 +21,8 @@
         android:indeterminateTint="@color/primary_text"
         android:layout_width="@dimen/_22sdp"
         android:layout_height="@dimen/_22sdp"
-        android:layout_marginBottom="@dimen/_26sdp"
+        android:layout_marginTop="@dimen/_16sdp"
+        android:layout_marginBottom="@dimen/_40sdp"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"