diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f8656a7..def4b35 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index e979d21..5a3311e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 29 - versionCode 60 + versionCode 62 versionName "2.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/app-release.aab b/app/release/app-release.aab index 6bb31ba..8dc2325 100644 Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6888140..694c341 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ <uses-permission android:name="android.permission.READ_CALENDAR" /> <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="com.android.vending.BILLING" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> @@ -69,6 +69,8 @@ <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" /> <action android:name="android.intent.action.DATE_CHANGED" /> <action android:name="android.intent.action.TIME_SET" /> + <action android:name="android.intent.action.TIMEZONE_CHANGED" /> + <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> </receiver> <receiver @@ -81,6 +83,8 @@ <category android:name="android.intent.category.DEFAULT" /> <action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> <action android:name="android.intent.action.TIME_SET" /> + <action android:name="android.intent.action.TIMEZONE_CHANGED" /> + <action android:name="android.intent.action.LOCALE_CHANGED" /> </intent-filter> </receiver> diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt index 710d90e..4cb84db 100755 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt @@ -10,15 +10,14 @@ object Preferences : KotprefModel() { var darkThemePreference by intPref(default = if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) MODE_NIGHT_FOLLOW_SYSTEM else MODE_NIGHT_AUTO_BATTERY) var showEvents by booleanPref(key = "PREF_SHOW_EVENTS", default = false) - var showWeather by booleanPref(key = "PREF_SHOW_WEATHER") - var weatherIcon by stringPref(key = "PREF_WEATHER_ICON") - var weatherTemp by floatPref(key = "PREF_WEATHER_TEMP") + var showWeather by booleanPref(key = "PREF_SHOW_WEATHER", default = false) + var weatherIcon by stringPref(key = "PREF_WEATHER_ICON", default = "") + var weatherTemp by floatPref(key = "PREF_WEATHER_TEMP", default = 0f) var weatherTempUnit by stringPref(key = "PREF_WEATHER_TEMP_UNIT", default = "F") var weatherRealTempUnit by stringPref(key = "PREF_WEATHER_REAL_TEMP_UNIT", default = "F") - var calendarAllDay by booleanPref(key = "PREF_CALENDAR_ALL_DAY", default = false) + var calendarAllDay by booleanPref(key = "PREF_CALENDAR_ALL_DAY", default = true) var calendarFilter by stringPref(key = "PREF_CALENDAR_FILTER", default = "") - var eventId by intPref(key = "PREF_EVENT_ID", default = -1) var nextEventId by longPref(key = "PREF_NEXT_EVENT_ID", default = -1) var nextEventName by stringPref(key = "PREF_NEXT_EVENT_NAME") var nextEventStartDate by longPref(key = "PREF_NEXT_EVENT_START_DATE") @@ -29,7 +28,6 @@ object Preferences : KotprefModel() { var customLocationLat by stringPref(key = "PREF_CUSTOM_LOCATION_LAT", default = "") var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "") var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "") - var hourFormat by stringPref(key = "PREF_HOUR_FORMAT", default = "12") var dateFormat by stringPref(default = "") var weatherRefreshPeriod by intPref(key = "PREF_WEATHER_REFRESH_PERIOD", default = 1) var showUntil by intPref(key = "PREF_SHOW_UNTIL", default = 1) @@ -41,7 +39,6 @@ object Preferences : KotprefModel() { var eventAppName by stringPref(key = "PREF_EVENT_APP_NAME", default = "") var eventAppPackage by stringPref(key = "PREF_EVENT_APP_PACKAGE", default = "") var openEventDetails by booleanPref(default = true) - var showEventLocation by stringPref(key = "PREF_SHOW_EVENT_LOCATION", default = "") var textGlobalColor by stringPref(key = "PREF_TEXT_COLOR", default = "#FFFFFF") var textMainSize by floatPref(key = "PREF_TEXT_MAIN_SIZE", default = 26f) var textSecondSize by floatPref(key = "PREF_TEXT_SECOND_SIZE", default = 18f) @@ -52,18 +49,14 @@ object Preferences : KotprefModel() { var clockAppPackage by stringPref(key = "PREF_CLOCK_APP_PACKAGE", default = "") var showNextAlarm by booleanPref(default = false) var textShadow by intPref(key = "PREF_TEXT_SHADOW", default = 1) - var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME") - var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = true) - var openWeatherApiKey by stringPref(key = "PREF_OPEN_WEATHER_API_KEY", default = "") - var darkSkyApiKey by stringPref(key = "PREF_DARK_SKY_API_KEY", default = "") - var wuApiKey by stringPref(key = "PREF_WU_API_KEY", default = "") - var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 1) + var showDiffTime by booleanPref(key = "PREF_SHOW_DIFF_TIME", default = true) + var showDeclinedEvents by booleanPref(key = "PREF_SHOW_DECLINED_EVENTS", default = false) + var secondRowInformation by intPref(key = "PREF_SECOND_ROW_INFORMATION", default = 0) var customFont by intPref(key = "PREF_CUSTOM_FONT", default = Constants.CUSTOM_FONT_PRODUCT_SANS) var customFontFile by stringPref(key = "PREF_CUSTOM_FONT_FILE") var showNextEvent by booleanPref(key = "PREF_SHOW_NEXT_EVENT", default = true) - var showGpsInformation by booleanPref(key = "PREF_SHOW_GPS_NOTIFICATION", default = true) - var showWallpaper by booleanPref(default = false) + var showWallpaper by booleanPref(default = true) var showBigClockWarning by booleanPref(default = true) var showWeatherWarning by booleanPref(default = true) } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt index 9dc3fa3..84964e7 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt @@ -7,6 +7,7 @@ import android.util.Log import android.view.View import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat +import androidx.core.view.drawToBitmap import com.google.firebase.crashlytics.FirebaseCrashlytics import java.lang.Exception @@ -19,10 +20,11 @@ object BitmapHelper { view.measure(measuredWidth, measuredHeight) return try { + Log.d("ciao", "bitmap ${view.measuredWidth}, ${view.measuredHeight} - draw = ${draw}") val btm = Bitmap.createBitmap( view.measuredWidth, view.measuredHeight, - Bitmap.Config.ARGB_8888 + if (draw) Bitmap.Config.ARGB_8888 else Bitmap.Config.ALPHA_8 ) if (draw) { //Bind a canvas to it @@ -35,7 +37,7 @@ object BitmapHelper { btm } catch (ex: Exception) { FirebaseCrashlytics.getInstance().recordException(ex) - Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888) + Bitmap.createBitmap(5, 5, Bitmap.Config.ALPHA_8) } } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt index dfef192..cf07ab1 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt @@ -24,7 +24,7 @@ object WeatherHelper { val networkApi = WeatherNetworkApi(context) if (Preferences.customLocationAdd != "") { networkApi.updateWeather() - } else if (context.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION)) { + } else if (context.checkGrantedPermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION)) { LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnCompleteListener { task -> if (task.isSuccessful) { val location = task.result diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt index 84106f1..9567036 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/NewCalendarEventReceiver.kt @@ -12,7 +12,6 @@ class NewCalendarEventReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val eventRepository = EventRepository(context) - Log.d("ciao", "nuovo evento") when (intent.action) { Intent.ACTION_PROVIDER_CHANGED, Intent.ACTION_TIME_CHANGED -> { diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt index 241a746..883f545 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt @@ -21,6 +21,9 @@ class UpdatesReceiver : BroadcastReceiver() { when (intent.action) { Intent.ACTION_BOOT_COMPLETED, Intent.ACTION_MY_PACKAGE_REPLACED, + Intent.ACTION_TIME_CHANGED, + Intent.ACTION_TIMEZONE_CHANGED, + Intent.ACTION_LOCALE_CHANGED, Actions.ACTION_CALENDAR_UPDATE -> CalendarHelper.updateEventList(context) "com.sec.android.widgetapp.APPWIDGET_RESIZE", diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt index 396abfe..ddae697 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt @@ -17,6 +17,8 @@ class WeatherReceiver : BroadcastReceiver() { when (intent.action) { Intent.ACTION_BOOT_COMPLETED, Intent.ACTION_MY_PACKAGE_REPLACED, + Intent.ACTION_TIMEZONE_CHANGED, + Intent.ACTION_LOCALE_CHANGED, Intent.ACTION_TIME_CHANGED -> setUpdates(context) Actions.ACTION_WEATHER_UPDATE -> WeatherHelper.updateWeather(context) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt index 427fab0..4a368be 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/CustomLocationActivity.kt @@ -125,7 +125,7 @@ class CustomLocationActivity : AppCompatActivity() { private fun requirePermission() { Dexter.withContext(this) .withPermissions( - Manifest.permission.ACCESS_FINE_LOCATION + Manifest.permission.ACCESS_BACKGROUND_LOCATION ).withListener(object: MultiplePermissionsListener { override fun onPermissionsChecked(report: MultiplePermissionsReport?) { report?.let { diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt index cc88a44..a7a330a 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt @@ -34,10 +34,7 @@ import com.tommasoberlose.anotherwidget.utils.getCurrentWallpaper import com.tommasoberlose.anotherwidget.utils.toPixel import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.the_widget_sans.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import kotlinx.coroutines.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -91,12 +88,13 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh private fun updateUI() { preview.setCardBackgroundColor(getColor(if (ColorHelper.getFontColor().isColorDark()) android.R.color.white else R.color.colorAccent)) - val generatedView = MainWidget.generateWidgetView(this@MainActivity) - generatedView.measure(0, 0) - preview.measure(0, 0) uiJob?.cancel() uiJob = lifecycleScope.launch(Dispatchers.IO) { + delay(200) + val generatedView = MainWidget.generateWidgetView(this@MainActivity) + generatedView.measure(0, 0) + preview.measure(0, 0) val bitmap = BitmapHelper.getBitmapFromView(generatedView, if (preview.width > 0) preview.width else generatedView.measuredWidth, generatedView.measuredHeight) withContext(Dispatchers.Main) { // Clock diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt index ff18847..27affee 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt @@ -5,6 +5,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.os.Build import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -70,6 +71,7 @@ class AdvancedSettingsFragment : Fragment() { setupListener() app_version.text = "v%s".format(BuildConfig.VERSION_NAME) + requirePermission() } private fun subscribeUi( @@ -117,7 +119,7 @@ class AdvancedSettingsFragment : Fragment() { action_show_wallpaper.setOnClickListener { maintainScrollPosition { BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_title_show_wallpaper)) - .setSelectedValue(Preferences.showWallpaper) + .setSelectedValue(Preferences.showWallpaper && activity?.checkGrantedPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == true) .addItem( getString(R.string.settings_visible), true @@ -174,6 +176,7 @@ class AdvancedSettingsFragment : Fragment() { ).withListener(object: MultiplePermissionsListener { override fun onPermissionsChecked(report: MultiplePermissionsReport?) { report?.let { + Preferences.showWallpaper = false Preferences.showWallpaper = report.areAllPermissionsGranted() } } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt index 7c247cc..b7d83e8 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt @@ -89,6 +89,7 @@ class CalendarSettingsFragment : Fragment() { binding.isCalendarEnabled = it if (it) { + requirePermission() CalendarHelper.setEventUpdatesAndroidN(requireContext()) } else { CalendarHelper.removeEventUpdatesAndroidN(requireContext()) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt index 1ce1824..25205e0 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt @@ -115,6 +115,7 @@ class WeatherSettingsFragment : Fragment() { temp_unit.text = if (it == "F") getString(R.string.fahrenheit) else getString(R.string.celsius) } + checkLocationPermission() }) viewModel.weatherRefreshPeriod.observe(viewLifecycleOwner, Observer { @@ -133,7 +134,7 @@ class WeatherSettingsFragment : Fragment() { } private fun checkLocationPermission() { - if (activity?.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION) == true) { + if (activity?.checkGrantedPermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION) == true) { location_permission_alert_icon.isVisible = false WeatherReceiver.setUpdates(requireContext()) } else if (Preferences.showWeather && Preferences.customLocationAdd == "") { @@ -231,7 +232,7 @@ class WeatherSettingsFragment : Fragment() { private fun requirePermission() { Dexter.withContext(requireContext()) .withPermissions( - Manifest.permission.ACCESS_FINE_LOCATION + Manifest.permission.ACCESS_BACKGROUND_LOCATION ).withListener(object: MultiplePermissionsListener { override fun onPermissionsChecked(report: MultiplePermissionsReport?) { report?.let { diff --git a/app/src/main/res/drawable-hdpi/round_update_black_18.png b/app/src/main/res/drawable-hdpi/round_update_black_18.png new file mode 100644 index 0000000..d0ac73a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_update_black_18.png differ diff --git a/app/src/main/res/drawable-hdpi/round_update_black_24.png b/app/src/main/res/drawable-hdpi/round_update_black_24.png new file mode 100644 index 0000000..99d57eb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_update_black_24.png differ diff --git a/app/src/main/res/drawable-hdpi/round_update_black_36.png b/app/src/main/res/drawable-hdpi/round_update_black_36.png new file mode 100644 index 0000000..207213f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_update_black_36.png differ diff --git a/app/src/main/res/drawable-hdpi/round_update_black_48.png b/app/src/main/res/drawable-hdpi/round_update_black_48.png new file mode 100644 index 0000000..f9a63e5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/round_update_black_48.png differ diff --git a/app/src/main/res/drawable-mdpi/round_update_black_18.png b/app/src/main/res/drawable-mdpi/round_update_black_18.png new file mode 100644 index 0000000..51ae8e5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_update_black_18.png differ diff --git a/app/src/main/res/drawable-mdpi/round_update_black_24.png b/app/src/main/res/drawable-mdpi/round_update_black_24.png new file mode 100644 index 0000000..b2867ef Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_update_black_24.png differ diff --git a/app/src/main/res/drawable-mdpi/round_update_black_36.png b/app/src/main/res/drawable-mdpi/round_update_black_36.png new file mode 100644 index 0000000..99d57eb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_update_black_36.png differ diff --git a/app/src/main/res/drawable-mdpi/round_update_black_48.png b/app/src/main/res/drawable-mdpi/round_update_black_48.png new file mode 100644 index 0000000..3b2f0e9 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/round_update_black_48.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_update_black_18.png b/app/src/main/res/drawable-xhdpi/round_update_black_18.png new file mode 100644 index 0000000..99d57eb Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_update_black_18.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_update_black_24.png b/app/src/main/res/drawable-xhdpi/round_update_black_24.png new file mode 100644 index 0000000..3b2f0e9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_update_black_24.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_update_black_36.png b/app/src/main/res/drawable-xhdpi/round_update_black_36.png new file mode 100644 index 0000000..f9a63e5 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_update_black_36.png differ diff --git a/app/src/main/res/drawable-xhdpi/round_update_black_48.png b/app/src/main/res/drawable-xhdpi/round_update_black_48.png new file mode 100644 index 0000000..f308f93 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/round_update_black_48.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_update_black_18.png b/app/src/main/res/drawable-xxhdpi/round_update_black_18.png new file mode 100644 index 0000000..207213f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_update_black_18.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_update_black_24.png b/app/src/main/res/drawable-xxhdpi/round_update_black_24.png new file mode 100644 index 0000000..f9a63e5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_update_black_24.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_update_black_36.png b/app/src/main/res/drawable-xxhdpi/round_update_black_36.png new file mode 100644 index 0000000..3e595bd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_update_black_36.png differ diff --git a/app/src/main/res/drawable-xxhdpi/round_update_black_48.png b/app/src/main/res/drawable-xxhdpi/round_update_black_48.png new file mode 100644 index 0000000..6f218d4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/round_update_black_48.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_update_black_18.png b/app/src/main/res/drawable-xxxhdpi/round_update_black_18.png new file mode 100644 index 0000000..f9a63e5 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_update_black_18.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_update_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_update_black_24.png new file mode 100644 index 0000000..f308f93 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_update_black_24.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_update_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_update_black_36.png new file mode 100644 index 0000000..6f218d4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_update_black_36.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/round_update_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_update_black_48.png new file mode 100644 index 0000000..88ec40b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/round_update_black_48.png differ diff --git a/app/src/main/res/drawable/round_update.xml b/app/src/main/res/drawable/round_update.xml new file mode 100644 index 0000000..2425d97 --- /dev/null +++ b/app/src/main/res/drawable/round_update.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + <path + android:fillColor="@android:color/white" + android:pathData="M11,8.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26c0.21,-0.36 0.1,-0.82 -0.26,-1.03l-2.87,-1.71v-3.4C12.5,8.34 12.16,8 11.75,8S11,8.34 11,8.75zM21,9.5V4.21c0,-0.45 -0.54,-0.67 -0.85,-0.35l-1.78,1.78c-1.81,-1.81 -4.39,-2.85 -7.21,-2.6c-4.19,0.38 -7.64,3.75 -8.1,7.94C2.46,16.4 6.69,21 12,21c4.59,0 8.38,-3.44 8.93,-7.88c0.07,-0.6 -0.4,-1.12 -1,-1.12c-0.5,0 -0.92,0.37 -0.98,0.86c-0.43,3.49 -3.44,6.19 -7.05,6.14c-3.71,-0.05 -6.84,-3.18 -6.9,-6.9C4.94,8.2 8.11,5 12,5c1.93,0 3.68,0.79 4.95,2.05l-2.09,2.09C14.54,9.46 14.76,10 15.21,10h5.29C20.78,10 21,9.78 21,9.5z"/> +</vector> diff --git a/app/src/main/res/layout/fragment_weather_settings.xml b/app/src/main/res/layout/fragment_weather_settings.xml index f946070..1715b33 100644 --- a/app/src/main/res/layout/fragment_weather_settings.xml +++ b/app/src/main/res/layout/fragment_weather_settings.xml @@ -250,7 +250,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:padding="12dp" - android:src="@drawable/round_schedule" + android:src="@drawable/round_update" android:tint="@color/colorPrimaryText"/> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9bc5744..1aa4251 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,7 +125,7 @@ <string name="beta" translatable="false">Beta</string> <string name="settings_product_sans_font_title">Product Sans Font</string> <string name="settings_product_sans_font_subtitle">Using Product Sans disabled the possibility to tap widget elements. I\'m working on it.</string> - <string name="settings_show_diff_time_title">Time left in the event</string> + <string name="settings_show_diff_time_title">Time left to the event</string> <string name="settings_visible">Visible</string> <string name="settings_not_visible">Hidden</string> <string name="settings_show_declined_events_title">Declined events</string> diff --git a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml index a0f5166..02cd6e0 100644 --- a/tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml +++ b/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="60" + android:versionCode="61" android:versionName="2.0.5" > <uses-sdk diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 6d62ea6..35d36fe 100644 --- a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Mon May 04 20:03:44 CEST 2020 +#Tue May 05 00:25:41 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 diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 4b98669..066c326 100644 Binary files a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index dca5fda..b7c16b9 100644 --- a/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -4,7 +4,7 @@ featureSplit="tasksintegration" package="com.tommasoberlose.anotherwidget" android:targetSandboxVersion="2" - android:versionCode="60" + android:versionCode="61" android:versionName="2.0.5" > <uses-sdk diff --git a/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 951f047..2d1e048 100644 --- a/tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/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="60" +6 android:versionCode="61" 7 android:versionName="2.0.5" > 8 9 <uses-sdk diff --git a/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml index a0f5166..02cd6e0 100644 --- a/tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/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="60" + android:versionCode="61" android:versionName="2.0.5" > <uses-sdk diff --git a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml b/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml index ff8fe26..f3c593f 100644 --- a/tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml +++ b/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="60" + android:versionCode="61" android:versionName="2.0.5" > <uses-sdk android:targetSdkVersion="29" />