Merge branch 'master' of github.com:tommasoberlose/another-widget

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: tommasoberlose
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. OnePlus 6]
+ - OS Version: [e.g. Android 9.0]
+ - App Version (that you can find inside the advanced settings) [e.g. v2.0.5 (71)]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: tommasoberlose
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

app/build.gradle

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

app/src/main/java/com/tommasoberlose/anotherwidget/components/BottomSheetColorPicker.kt

@@ -16,6 +16,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.card.MaterialCardView
@@ -79,61 +80,51 @@ class BottomSheetColorPicker(
 
         // List
 
-        view.menu.setHasFixedSize(true)
-        val mLayoutManager = GridLayoutManager(context, 6)
-        view.menu.layoutManager = mLayoutManager
-
         adapter = SlimAdapter.create()
 
-        adapter
-            .register<Int>(R.layout.color_picker_menu_item) { item, injector ->
-                injector
-                    .with<MaterialCardView>(R.id.color) {
-                        loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
-                            val colorList = ColorStateList.valueOf(item)
-                            withContext(Dispatchers.Main) {
-                                it.setCardBackgroundColor(colorList)
-                            }
-                        })
-                    }
-                    .with<AppCompatImageView>(R.id.check) {
-                        if (getSelected?.invoke() == item) {
-                            loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
-                                val colorList = ContextCompat.getColor(
-                                    context,
-                                    if (item.isColorDark()) android.R.color.white else android.R.color.black
-                                )
-                                withContext(Dispatchers.Main) {
-                                    it.setColorFilter(
-                                        colorList,
-                                        android.graphics.PorterDuff.Mode.MULTIPLY
-                                    )
-                                    it.isVisible = true
-                                }
-                            })
-                        } else {
-                            it.isVisible = false
-                        }
-                    }
-                injector.clicked(R.id.color) {
-                    adapter.notifyItemChanged(adapter.data.indexOf(getSelected?.invoke()))
-                    onColorSelected?.invoke(item)
-                    val position = adapter.data.indexOf(item)
-                    adapter.notifyItemChanged(position)
-                    (view.menu.layoutManager as GridLayoutManager).scrollToPositionWithOffset(position,0)
-                }
-            }
-                .attachTo(view.menu)
-
         loadingJobs.add(GlobalScope.launch(Dispatchers.IO) {
+            val listView = View.inflate(context, R.layout.bottom_sheet_menu_list, null) as RecyclerView
+            listView.setHasFixedSize(true)
+            val mLayoutManager = GridLayoutManager(context, 6)
+            listView.layoutManager = mLayoutManager
+
+            adapter
+                .register<Int>(R.layout.color_picker_menu_item) { item, injector ->
+                    injector
+                        .with<MaterialCardView>(R.id.color) {
+                            it.setCardBackgroundColor(ColorStateList.valueOf(item))
+                        }
+                        .with<AppCompatImageView>(R.id.check) {
+                            if (getSelected?.invoke() == item) {
+                                it.setColorFilter(
+                                    ContextCompat.getColor(
+                                        context,
+                                        if (item.isColorDark()) android.R.color.white else android.R.color.black
+                                    ),
+                                    android.graphics.PorterDuff.Mode.MULTIPLY
+                                )
+                                it.isVisible = true
+                            } else {
+                                it.isVisible = false
+                            }
+                        }
+                        .clicked(R.id.color) {
+                            adapter.notifyItemChanged(adapter.data.indexOf(getSelected?.invoke()))
+                            onColorSelected?.invoke(item)
+                            val position = adapter.data.indexOf(item)
+                            adapter.notifyItemChanged(position)
+                            (listView.layoutManager as GridLayoutManager).scrollToPositionWithOffset(position,0)
+                        }
+                }
+                .attachTo(listView)
 
             adapter.updateData(colors.toList())
 
             withContext(Dispatchers.Main) {
                 view.color_loader.isVisible = false
+                view.list_container.addView(listView)
                 this@BottomSheetColorPicker.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-//                this@BottomSheetColorPicker.behavior.isFitToContents = false
-                view.menu.isVisible = true
+                view.list_container.isVisible = true
             }
         })
 

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

@@ -79,7 +79,7 @@ object IntentHelper {
         val calendarUri = CalendarContract.CONTENT_URI
             .buildUpon()
             .appendPath("time")
-            .appendPath("0".toString())
+            .appendPath(Calendar.getInstance().timeInMillis.toString())
             .build()
         return when (Preferences.calendarAppPackage) {
             "" -> {
@@ -116,6 +116,8 @@ object IntentHelper {
                         data = uri
                         putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
                         putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
+//                        type = "vnd.android.cursor.item/event"
                     }
                 } else {
                     getCalendarIntent(context).apply {
@@ -123,6 +125,8 @@ object IntentHelper {
                         data = uri
                         putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate)
                         putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate)
+//                        putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, if (e.allDay) 1 else 0)
+//                        type = "vnd.android.cursor.item/event"
                     }
                 }
             }

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WeatherReceiver.kt

@@ -34,8 +34,6 @@ class WeatherReceiver : BroadcastReceiver() {
             removeUpdates(context)
 
             if (Preferences.showWeather && Preferences.weatherProviderApi != "") {
-                WeatherHelper.updateWeather(context)
-
                 val interval = MINUTE * when (Preferences.weatherRefreshPeriod) {
                     0 -> 30
                     1 -> 60
@@ -48,7 +46,7 @@ class WeatherReceiver : BroadcastReceiver() {
                 with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
                     setRepeating(
                         AlarmManager.RTC,
-                        Calendar.getInstance().timeInMillis + interval,
+                        Calendar.getInstance().timeInMillis,
                         interval,
                         PendingIntent.getBroadcast(context, 0, Intent(context, WeatherReceiver::class.java).apply { action = Actions.ACTION_WEATHER_UPDATE }, 0)
                     )

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt

@@ -92,9 +92,6 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
         subscribeUi(viewModel)
         updateUI()
 
-        WeatherHelper.updateWeather(this)
-
-
         // Warnings
         if (getString(R.string.xiaomi_manufacturer).equals(Build.MANUFACTURER, ignoreCase = true) && Preferences.showXiaomiWarning) {
             MaterialBottomSheetDialog(this, getString(R.string.xiaomi_warning_title), getString(R.string.xiaomi_warning_message))

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/AdvancedSettingsFragment.kt

@@ -29,6 +29,7 @@ import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.activities.SupportDevActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
+import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.openURI
@@ -187,7 +188,7 @@ class AdvancedSettingsFragment : Fragment() {
         }
 
         action_refresh_widget.setOnClickListener {
-            MainWidget.updateWidget(requireContext())
+            WeatherHelper.updateWeather(requireContext())
             CalendarHelper.updateEventList(requireContext())
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarSettingsFragment.kt

@@ -156,6 +156,9 @@ class CalendarSettingsFragment : Fragment() {
 
         action_show_events.setOnClickListener {
             Preferences.showEvents = !Preferences.showEvents
+            if (Preferences.showEvents) {
+                requirePermission()
+            }
         }
 
         action_filter_calendar.setOnClickListener {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherSettingsFragment.kt

@@ -81,12 +81,14 @@ class WeatherSettingsFragment : Fragment() {
     ) {
         viewModel.showWeatherWarning.observe(viewLifecycleOwner, Observer {
             weather_warning?.isVisible = it
+            checkLocationPermission()
         })
 
         viewModel.showWeather.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_weather_label?.text =
                     if (it) getString(R.string.show_weather_visible) else getString(R.string.show_weather_not_visible)
+                checkWeatherProviderConfig()
                 binding.isWeatherVisible = it
             }
             checkLocationPermission()
@@ -94,11 +96,7 @@ class WeatherSettingsFragment : Fragment() {
 
         viewModel.weatherProviderApi.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
-                label_weather_provider_api_key?.text =
-                    if (it == "") getString(R.string.settings_weather_provider_api_key_subtitle_not_set) else getString(
-                        R.string.settings_weather_provider_api_key_subtitle_all_set
-                    )
-                label_weather_provider_api_key?.setTextColor(ContextCompat.getColor(requireContext(), if (it == "") R.color.errorColorText else R.color.colorSecondaryText))
+                checkWeatherProviderConfig()
             }
             checkLocationPermission()
         })
@@ -148,9 +146,19 @@ class WeatherSettingsFragment : Fragment() {
             location_permission_alert?.setOnClickListener {
                 requirePermission()
             }
+        } else {
+            location_permission_alert?.isVisible = false
         }
     }
 
+    private fun checkWeatherProviderConfig() {
+        label_weather_provider_api_key?.text =
+            if (Preferences.weatherProviderApi == "") getString(R.string.settings_weather_provider_api_key_subtitle_not_set) else getString(
+                R.string.settings_weather_provider_api_key_subtitle_all_set
+            )
+        label_weather_provider_api_key?.setTextColor(ContextCompat.getColor(requireContext(), if (Preferences.weatherProviderApi == "" && Preferences.showWeather) R.color.errorColorText else R.color.colorSecondaryText))
+    }
+
     private fun setupListener() {
         action_hide_weather_warning.setOnClickListener {
             Preferences.showWeatherWarning = false

app/src/main/res/layout/bottom_sheet_menu_hor.xml

@@ -96,13 +96,11 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <androidx.recyclerview.widget.RecyclerView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="300dp"
-            android:id="@+id/menu"
-            android:visibility="gone"
-            android:clipToPadding="false"
-            android:padding="16dp"/>
+            android:layout_height="260dp"
+            android:id="@+id/list_container"
+            android:orientation="vertical" />
         <ProgressBar
             android:layout_width="32dp"
             android:layout_height="32dp"

app/src/main/res/layout/bottom_sheet_menu_list.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="260dp"
+    android:id="@+id/menu"
+    android:clipToPadding="false"
+    android:padding="16dp"/>

app/src/main/res/layout/fragment_weather_settings.xml

@@ -198,6 +198,7 @@
                             android:paddingBottom="0dp"
                             android:paddingTop="0dp"
                             android:focusable="true"
+                            android:visibility="gone"
                             android:id="@+id/location_permission_alert"
                             android:textColor="@color/errorColorText"
                             android:text="@string/action_grant_permission"/>