Merge pull request #32 from furkanaskin/dev

Fix release app crashes
furkanaskin · Jul 24, 2021 · 100ff19 · 100ff19
2 parents a4c30d4 + 1bd33c2
commit 100ff19
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,12 +32,12 @@ jobs:
             ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('checksum.txt') }}
 
-      - name: Assemble Debug App
-        run: ./gradlew clean assembleDebug
+      - name: Assemble Release App
+        run: ./gradlew clean assembleRelease
 
       - name: Release a new version
         uses: softprops/action-gh-release@v1
         with:
-          files: app/build/outputs/apk/debug/*.apk
+          files: app/build/outputs/apk/release/*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/app/build.gradle b/app/build.gradle
@@ -50,6 +50,8 @@ android {
             debuggable false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testCoverageEnabled false
+
+            signingConfig signingConfigs.debug
         }
         debug {
             ext.enableCrashlytics = false

diff --git a/app/src/main/java/com/faskn/app/weatherapp/ui/dashboard/forecast/ForecastAdapter.kt b/app/src/main/java/com/faskn/app/weatherapp/ui/dashboard/forecast/ForecastAdapter.kt
@@ -13,9 +13,9 @@ import com.faskn.app.weatherapp.domain.model.ListItem
  * Created by Furkan on 2019-10-25
  */
 
-class ForecastAdapter(private val callBack: (ListItem, View, View, View, View, View) -> Unit) : BaseAdapter<ListItem>(
-    diffCallback
-) {
+class ForecastAdapter(
+    private val callBack: (ListItem, View, View, View, View, View) -> Unit
+) : BaseAdapter<ListItem>(diffCallback) {
 
     override fun createBinding(parent: ViewGroup, viewType: Int): ViewDataBinding {
         val mBinding = ItemForecastBinding.inflate(
@@ -26,15 +26,15 @@ class ForecastAdapter(private val callBack: (ListItem, View, View, View, View, V
         val viewModel = ForecastItemViewModel()
         mBinding.viewModel = viewModel
 
-        mBinding.rootView.setOnClickListener {
+        mBinding.cardView.setOnClickListener {
             mBinding.viewModel?.item?.get()?.let { /*
                 ViewCompat.setTransitionName(mBinding.cardView, mBinding.rootView.resources.getString(R.string.cardView, it.getDay()))
                 ViewCompat.setTransitionName(mBinding.imageViewForecastIcon, mBinding.rootView.resources.getString(R.string.forecastIcon, it.getDay()))
                 ViewCompat.setTransitionName(mBinding.textViewDayOfWeek, mBinding.rootView.resources.getString(R.string.dayOfWeek, it.getDay()))
                 ViewCompat.setTransitionName(mBinding.textViewTemp, mBinding.rootView.resources.getString(R.string.temp, it.getDay()))
                 ViewCompat.setTransitionName(mBinding.linearLayoutTempMaxMin, mBinding.rootView.resources.getString(R.string.tempMaxMin, it.getDay()))*/
 
-                callBack.invoke(
+                callBack(
                     it,
                     mBinding.cardView,
                     mBinding.imageViewForecastIcon,

diff --git a/app/src/main/res/layout/fragment_github_dialog.xml b/app/src/main/res/layout/fragment_github_dialog.xml
@@ -44,16 +44,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/textViewAboutApp"
+        android:layout_alignStart="@id/textViewAboutApp"
+        android:layout_alignEnd="@id/textViewAboutApp"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
+        android:background="?attr/selectableItemBackground"
+        android:gravity="center"
         android:orientation="horizontal">
 
         <ImageView
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_gravity="center"
-            android:src="@drawable/ic_github" />
+            android:src="@drawable/ic_github"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
@@ -15,7 +15,6 @@
 
     </data>
 
-
     <RelativeLayout
         android:id="@+id/rootView"
         android:layout_width="match_parent"
@@ -41,7 +40,6 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -78,13 +76,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:color/transparent"
-                    android:drawableEnd="@android:drawable/stat_notify_error"
                     android:paddingStart="12dp"
                     android:paddingTop="12dp"
                     android:paddingEnd="24dp"
                     android:paddingBottom="12dp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
+                    app:drawableEndCompat="@android:drawable/stat_notify_error"
                     app:setErrorText="@{viewState}"
                     tools:text="Status code : 500 Internal server error!" />
 

diff --git a/app/src/main/res/layout/item_forecast.xml b/app/src/main/res/layout/item_forecast.xml
@@ -44,16 +44,17 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="40dp"
-            android:transitionName="@{String.format(@string/cardView, viewModel.item.getDay())}"
             android:backgroundTint="@{viewModel.item.getColor()}"
+            android:clickable="true"
+            android:focusable="true"
+            android:transitionName="@{String.format(@string/cardView, viewModel.item.getDay())}"
             app:cardCornerRadius="24dp"
             tools:backgroundTint="@android:color/holo_orange_dark">
 
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
-
                 <ImageView
                     android:layout_width="170dp"
                     android:layout_height="124dp"
@@ -62,7 +63,6 @@
                     android:layout_marginEnd="-40dp"
                     android:src="@drawable/ic_splash_big_cloud" />
 
-
                 <TextView
                     android:id="@+id/textViewTimeOfDay"
                     android:layout_width="wrap_content"
@@ -86,8 +86,8 @@
                     android:textColor="@color/white"
                     android:textSize="14sp"
                     android:textStyle="bold"
-                    tools:text="Monday"
-                    android:transitionName="@{String.format(@string/dayOfWeek, viewModel.item.getDay())}" />
+                    android:transitionName="@{String.format(@string/dayOfWeek, viewModel.item.getDay())}"
+                    tools:text="Monday" />
 
                 <ImageView
                     android:id="@+id/imageViewForecastIcon"
@@ -96,9 +96,9 @@
                     android:layout_below="@id/textViewDayOfWeek"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="12dp"
+                    android:transitionName="@{String.format(@string/forecastIcon, viewModel.item.getDay())}"
                     app:setWeatherIcon="@{viewModel.item.getWeatherItem().icon}"
-                    tools:src="@drawable/ic_splash_big_cloud"
-                    android:transitionName="@{String.format(@string/forecastIcon, viewModel.item.getDay())}"/>
+                    tools:src="@drawable/ic_splash_big_cloud" />
 
                 <TextView
                     android:id="@+id/textViewTemp"
@@ -111,8 +111,8 @@
                     android:textColor="@color/white"
                     android:textSize="26sp"
                     android:textStyle="bold"
-                    tools:text="23°"
-                    android:transitionName="@{String.format(@string/temp, viewModel.item.getDay())}"/>
+                    android:transitionName="@{String.format(@string/temp, viewModel.item.getDay())}"
+                    tools:text="23°" />
 
                 <LinearLayout
                     android:id="@+id/linearLayoutTempMaxMin"

diff --git a/app/src/main/res/raw/keep.xml b/app/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@drawable/*_svg" />