sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-08 21:37:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update dependencies

Browse source
This commit is contained in:
Phillip Thelen 2022-02-01 10:17:14 +01:00
parent 46caca91e2
commit dde0aa72b4
13 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Habitica/build.gradle
View file

@ -51,10 +51,10 @@ dependencies {
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
compileOnly 'com.github.pengrad:jdk9-deps:1.0'
//App Compatibility and Material Design
implementation 'androidx.appcompat:appcompat:1.4.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.preference:preference-ktx:1.2.0"
// Markdown
@ -121,10 +121,10 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0"
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0'
implementation 'androidx.navigation:navigation-ui-ktx:2.4.0'
implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
implementation "androidx.fragment:fragment-ktx:1.4.0"
implementation "androidx.fragment:fragment-ktx:1.4.1"
implementation "androidx.paging:paging-runtime-ktx:3.1.0"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'
@ -142,7 +142,7 @@ dependencies {
android {
compileSdkVersion 32
buildToolsVersion '30.0.2'
buildToolsVersion '30.0.3'
testOptions {
unitTests {
includeAndroidResources = true
@ -157,7 +157,7 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 3218
versionCode 3221
versionName "3.5"
targetSdkVersion 32
@ -382,8 +382,8 @@ def mainSrc = "${project.projectDir}/src/main/java"
task jacocoTestReport(type: JacocoReport, dependsOn: 'testProdDebugUnitTest') {
group = "Reporting"
reports {
html.enabled = true
xml.enabled = true
html.required.set(true)
xml.required.set(true)
//html.destination = "${buildDir}/reports/jacoco"
}
@ -404,7 +404,6 @@ task jacocoTestReport(type: JacocoReport, dependsOn: 'testProdDebugUnitTest') {
task ktlint(type: JavaExec, group: "verification") {
description = "Check Kotlin code style."
classpath = configurations.ktlint
main = "com.pinterest.ktlint.Main"
args "--disabled_rules=no-wildcard-imports", "--reporter=plain?group_by_file", "src/**/*.kt"
// to generate report in checkstyle format prepend following args:
// "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/ktlint.xml"
@ -417,6 +416,5 @@ check.dependsOn ktlint
task ktlintFormat(type: JavaExec, group: "formatting") {
description = "Fix Kotlin code style deviations."
classpath = configurations.ktlint
main = "com.pinterest.ktlint.Main"
args "--disabled_rules=no-wildcard-imports", "-F", "src/**/*.kt"
}

2
Habitica/res/navigation/navigation.xml
View file

@ -464,7 +464,7 @@
<argument
android:name="url"
app:argType="string" />
<deepLink app:uri="habitica.com/promo/web" />
<deepLink app:uri="habitica.com/promo/web?url={url}" />
</fragment>
<fragment
android:id="@+id/teamBoardFragment"

1
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
View file

@ -121,6 +121,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
const val TASK_NAME_INTENT_KEY = "TASK_NAME"
fun scheduleDailyReminder(context: Context?) {
if (context == null) return
val prefs = PreferenceManager.getDefaultSharedPreferences(context)
if (prefs.getBoolean("use_reminder", false)) {
val timeval = prefs.getString("reminder_time", "19:00")

2
Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
View file

@ -34,7 +34,7 @@ class AppModule(private val application: Application) {
@Provides
@Singleton
fun provideSharedPreferences(context: Context?): SharedPreferences {
fun provideSharedPreferences(context: Context): SharedPreferences {
return PreferenceManager.getDefaultSharedPreferences(context)
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.kt
View file

@ -7,7 +7,7 @@ import androidx.preference.DialogPreference
import java.text.DateFormat
import java.util.*
class TimePreference(ctxt: Context?, attrs: AttributeSet?) : DialogPreference(ctxt, attrs) {
class TimePreference(ctxt: Context, attrs: AttributeSet?) : DialogPreference(ctxt, attrs) {
private var timeval: String? = null
override fun onGetDefaultValue(a: TypedArray, index: Int): Any {
return a.getString(index)!!
@ -39,7 +39,7 @@ class TimePreference(ctxt: Context?, attrs: AttributeSet?) : DialogPreference(ct
}
}
override fun setSummary(summary: CharSequence) {
override fun setSummary(summary: CharSequence?) {
val calendar = Calendar.getInstance(Locale.getDefault())
calendar.set(Calendar.HOUR_OF_DAY, getHour(timeval))
calendar.set(Calendar.MINUTE, getMinute(timeval))

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
View file

@ -64,11 +64,11 @@ class AccountPreferenceFragment: BasePreferencesFragment(),
override fun onResume() {
super.onResume()
preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
}
override fun onPause() {
preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
super.onPause()
}
@ -130,8 +130,8 @@ class AccountPreferenceFragment: BasePreferencesFragment(),
preference?.summary = value
}
override fun onPreferenceTreeClick(preference: Preference?): Boolean {
when(preference?.key) {
override fun onPreferenceTreeClick(preference: Preference): Boolean {
when(preference.key) {
"username" -> showLoginNameDialog()
"confirm_username" -> showConfirmUsernameDialog()
"email" -> {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
View file

@ -33,7 +33,7 @@ class DayStartPreferenceDialogFragment : PreferenceDialogFragmentCompat() {
return lastHour.toString() + ":00"
}
override fun onCreateDialogView(context: Context?): View {
override fun onCreateDialogView(context: Context): View {
val wrapper = LinearLayout(context)
wrapper.orientation = LinearLayout.VERTICAL
picker = TimePicker(context)

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
View file

@ -19,12 +19,12 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
override fun onResume() {
super.onResume()
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
}
override fun onPause() {
super.onPause()
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
}
override fun setupPreferences() { /* no-on */ }

18
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
View file

@ -62,16 +62,16 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
override fun setupPreferences() {
timePreference = findPreference("reminder_time") as? TimePreference
val useReminder = preferenceManager.sharedPreferences.getBoolean("use_reminder", false)
timePreference?.isEnabled = useReminder
val useReminder = preferenceManager.sharedPreferences?.getBoolean("use_reminder", false)
timePreference?.isEnabled = useReminder ?: false
pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
val usePushNotifications = preferenceManager.sharedPreferences.getBoolean("usePushNotifications", true)
pushNotificationsPreference?.isEnabled = usePushNotifications
val usePushNotifications = preferenceManager.sharedPreferences?.getBoolean("usePushNotifications", true)
pushNotificationsPreference?.isEnabled = usePushNotifications ?: false
emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
val useEmailNotifications = preferenceManager.sharedPreferences.getBoolean("useEmailNotifications", true)
emailNotificationsPreference?.isEnabled = useEmailNotifications
val useEmailNotifications = preferenceManager.sharedPreferences?.getBoolean("useEmailNotifications", true)
emailNotificationsPreference?.isEnabled = useEmailNotifications ?: false
classSelectionPreference = findPreference("choose_class")
@ -80,7 +80,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
serverUrlPreference = findPreference("server_url") as? ListPreference
serverUrlPreference?.isVisible = false
serverUrlPreference?.summary = preferenceManager.sharedPreferences.getString("server_url", "")
serverUrlPreference?.summary = preferenceManager.sharedPreferences?.getString("server_url", "")
val themePreference = findPreference("theme_name") as? ListPreference
themePreference?.summary = themePreference?.entry ?: "Default"
@ -101,11 +101,11 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
override fun onResume() {
super.onResume()
preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
}
override fun onPause() {
preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
super.onPause()
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
View file

@ -19,12 +19,12 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
override fun onResume() {
super.onResume()
preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
preferenceScreen.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
}
override fun onPause() {
super.onPause()
preferenceScreen.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
preferenceScreen.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
}
override fun setupPreferences() { /* no-on */ }

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.kt
View file

@ -34,7 +34,7 @@ class TimePreferenceDialogFragment : PreferenceDialogFragmentCompat() {
return lastHour.toString() + ":" + String.format(Locale.UK, "%02d", lastMinute)
}
override fun onCreateDialogView(context: Context?): View {
override fun onCreateDialogView(context: Context): View {
picker = TimePicker(context)
picker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context))
return picker

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ExtraLabelPreference.kt
View file

@ -8,7 +8,7 @@ import androidx.preference.PreferenceViewHolder
import com.habitrpg.android.habitica.R
class ExtraLabelPreference(
context: Context?,
context: Context,
attrs: AttributeSet?
) : Preference(context, attrs) {
var extraText: String? = null
@ -18,9 +18,9 @@ class ExtraLabelPreference(
layoutResource = R.layout.preference_button
}
override fun onBindViewHolder(holder: PreferenceViewHolder?) {
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
val textView = holder?.itemView?.findViewById<TextView>(R.id.extra_label)
val textView = holder.itemView.findViewById<TextView>(R.id.extra_label)
textView?.text = extraText
extraTextColor?.let {
textView?.setTextColor(it)

4
Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
View file

@ -61,7 +61,7 @@ class AddTaskWidgetProvider : BaseWidgetProvider() {
}
private fun getSelectedTaskType(widgetId: Int): TaskType {
val preferences = PreferenceManager.getDefaultSharedPreferences(this.context)
return TaskType.from(preferences.getString("add_task_widget_$widgetId", TaskType.HABIT.value)) ?: TaskType.HABIT
val preferences = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
return TaskType.from(preferences?.getString("add_task_widget_$widgetId", TaskType.HABIT.value)) ?: TaskType.HABIT
}
}