isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #740 from hiqua/sdk_30

Browse Source 
Increase targetSdk to 30
This commit is contained in:
Alinson S. Xavier
2021-01-27 19:59:13 -06:00
committed by GitHub
parent 22136774de 2d943b5942
commit f36bc788c7
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uhabits-android/build.gradle.kts
View File

@@ -27,13 +27,13 @@ plugins {
} }
android { android {
compileSdkVersion(29) compileSdkVersion(30)
defaultConfig { defaultConfig {
versionCode(20001) versionCode(20001)
versionName("2.0.1-alpha") versionName("2.0.1-alpha")
minSdkVersion(23) minSdkVersion(23)
targetSdkVersion(29) targetSdkVersion(30)
applicationId("org.isoron.uhabits") applicationId("org.isoron.uhabits")
testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner") testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
} }

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.kt
View File

@@ -156,7 +156,7 @@ class ScoreChart : ScrollableChart {
drawMarker(activeCanvas, prevRect) drawMarker(activeCanvas, prevRect)
} }
if (k == nColumns - 1) drawMarker(activeCanvas, rect) if (k == nColumns - 1) drawMarker(activeCanvas, rect)
prevRect!!.set(rect) prevRect!!.set(rect!!)
rect!![0f, 0f, columnWidth] = columnHeight.toFloat() rect!![0f, 0f, columnWidth] = columnHeight.toFloat()
rect!!.offset(k * columnWidth, internalPaddingTop.toFloat()) rect!!.offset(k * columnWidth, internalPaddingTop.toFloat())
drawFooter(activeCanvas, rect, timestamp) drawFooter(activeCanvas, rect, timestamp)

2
uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
View File

@@ -147,7 +147,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
override fun onSharedPreferenceChanged( override fun onSharedPreferenceChanged(
sharedPreferences: SharedPreferences, sharedPreferences: SharedPreferences,
key: String key: String?
) { ) {
if (key == "pref_widget_opacity" && widgetUpdater != null) { if (key == "pref_widget_opacity" && widgetUpdater != null) {
Log.d("SettingsFragment", "updating widgets") Log.d("SettingsFragment", "updating widgets")

10
uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.kt
View File

@@ -45,12 +45,16 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
super.onCreate(bundle) super.onCreate(bundle)
val intent = intent val intent = intent
if (intent == null) finish() if (intent == null) finish()
if (intent.data == null) finish()
val app = applicationContext as HabitsApplication val app = applicationContext as HabitsApplication
val appComponent = app.component val appComponent = app.component
reminderController = appComponent.reminderController val data = intent.data
habit = appComponent.habitList.getById(ContentUris.parseId(intent.data)) if (data == null) {
finish()
} else {
habit = appComponent.habitList.getById(ContentUris.parseId(data))
}
if (habit == null) finish() if (habit == null) finish()
reminderController = appComponent.reminderController
val theme = R.style.Theme_AppCompat_Light_Dialog_Alert val theme = R.style.Theme_AppCompat_Light_Dialog_Alert
dialog = AlertDialog.Builder(ContextThemeWrapper(this, theme)) dialog = AlertDialog.Builder(ContextThemeWrapper(this, theme))
.setTitle(R.string.select_snooze_delay) .setTitle(R.string.select_snooze_delay)

2
uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt
View File

@@ -79,7 +79,7 @@ class SharedPreferencesStorage
override fun onSharedPreferenceChanged( override fun onSharedPreferenceChanged(
sharedPreferences: SharedPreferences, sharedPreferences: SharedPreferences,
key: String key: String?
) { ) {
val preferences = this.preferences ?: return val preferences = this.preferences ?: return
sharedPreferences.unregisterOnSharedPreferenceChangeListener(this) sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)

3
uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt
View File

@@ -46,7 +46,8 @@ class ReminderReceiver : BroadcastReceiver() {
Log.i(TAG, String.format("Received intent: %s", intent.toString())) Log.i(TAG, String.format("Received intent: %s", intent.toString()))
var habit: Habit? = null var habit: Habit? = null
val today: Long = getStartOfTodayWithOffset() val today: Long = getStartOfTodayWithOffset()
if (intent.data != null) habit = habits.getById(ContentUris.parseId(intent.data)) val data = intent.data
if (data != null) habit = habits.getById(ContentUris.parseId(data))
val timestamp = intent.getLongExtra("timestamp", today) val timestamp = intent.getLongExtra("timestamp", today)
val reminderTime = intent.getLongExtra("reminderTime", today) val reminderTime = intent.getLongExtra("reminderTime", today)
try { try {