Update bitmap generator

app/build.gradle

@@ -18,7 +18,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 75
+        versionCode 76
         versionName "2.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt

@@ -15,11 +15,13 @@ object BitmapHelper {
 
     fun getBitmapFromView(view: View, width: Int? = null, height: Int? = null, draw: Boolean = true): Bitmap {
         //Define a bitmap with the same size as the view
-        val measuredWidth = View.MeasureSpec.makeMeasureSpec(width ?: view.width, if (width != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.UNSPECIFIED)
+        val measuredWidth = View.MeasureSpec.makeMeasureSpec(width ?: view.width, if (width != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.AT_MOST)
         val measuredHeight = View.MeasureSpec.makeMeasureSpec(height ?: view.height, if (height != null) View.MeasureSpec.EXACTLY else View.MeasureSpec.UNSPECIFIED)
         view.measure(measuredWidth, measuredHeight)
 
         if (draw) {
+            FirebaseCrashlytics.getInstance().setCustomKey("initialWidth", width ?: -1)
+            FirebaseCrashlytics.getInstance().setCustomKey("initialHeight", height ?: -1)
             FirebaseCrashlytics.getInstance().setCustomKey("measuredWidth", view.measuredWidth)
             FirebaseCrashlytics.getInstance().setCustomKey("measuredWidth_spec", measuredWidth)
             FirebaseCrashlytics.getInstance().setCustomKey("measuredHeight", view.measuredHeight)

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt

@@ -3,6 +3,7 @@ package com.tommasoberlose.anotherwidget.helpers
 import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 object WidgetHelper {
     class WidgetSizeProvider(
@@ -16,6 +17,8 @@ object WidgetHelper {
             val height = getWidgetHeight(isPortrait, widgetId)
             val widthInPx = context.dip(width)
             val heightInPx = context.dip(height)
+            FirebaseCrashlytics.getInstance().setCustomKey("widthInPx", widthInPx)
+            FirebaseCrashlytics.getInstance().setCustomKey("heightInPx", heightInPx)
             return widthInPx to heightInPx
         }
 

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt

@@ -26,6 +26,7 @@ import com.tommasoberlose.anotherwidget.global.Actions
 import com.tommasoberlose.anotherwidget.global.Constants
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.*
+import com.tommasoberlose.anotherwidget.helpers.WidgetHelper.reduceDimensionWithMaxWidth
 import com.tommasoberlose.anotherwidget.receivers.*
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.getCapWordString

app/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="main_calendar">Account calendar</string>
     <string name="settings_calendar_title">Calendar</string>
     <string name="settings_weather_title">Weather</string>
-    <string name="settings_general_title">Typography</string>
+    <string name="settings_general_title">General</string>
     <string name="calendar_settings_list_error">Error loading the calendar list</string>
     <string name="settings_hour_format_title">Hour format</string>
     <string name="settings_hour_format_subtitle_12">12 hour</string>

tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="75"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu May 07 12:28:58 CEST 2020
+#Thu May 07 17:54:22 CEST 2020
 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -4,7 +4,7 @@
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
     android:targetSandboxVersion="2"
-    android:versionCode="74"
+    android:versionCode="75"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -3,7 +3,7 @@
 3    xmlns:dist="http://schemas.android.com/apk/distribution"
 4    featureSplit="tasksintegration"
 5    package="com.tommasoberlose.anotherwidget"
-6    android:versionCode="74"
+6    android:versionCode="75"
 7    android:versionName="2.0.5" >
 8
 9    <uses-sdk

tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="75"
     android:versionName="2.0.5" >
 
     <uses-sdk

tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
-    android:versionCode="74"
+    android:versionCode="75"
     android:versionName="2.0.5" >
 
     <uses-sdk android:targetSdkVersion="29" />