Eliminate Don't kill my app dependency, use web page
This commit is contained in:
parent
445edcd15c
commit
41c424c9f5
3 changed files with 17 additions and 15 deletions
|
@ -3,6 +3,8 @@ package info.nightscout.androidaps
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.graphics.Rect
|
import android.graphics.Rect
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.PersistableBundle
|
import android.os.PersistableBundle
|
||||||
import android.text.SpannableString
|
import android.text.SpannableString
|
||||||
|
@ -28,7 +30,6 @@ import com.google.android.material.tabs.TabLayoutMediator
|
||||||
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
import com.google.firebase.crashlytics.FirebaseCrashlytics
|
||||||
import com.joanzapata.iconify.Iconify
|
import com.joanzapata.iconify.Iconify
|
||||||
import com.joanzapata.iconify.fonts.FontAwesomeModule
|
import com.joanzapata.iconify.fonts.FontAwesomeModule
|
||||||
import dev.doubledot.doki.ui.DokiActivity
|
|
||||||
import info.nightscout.androidaps.activities.*
|
import info.nightscout.androidaps.activities.*
|
||||||
import info.nightscout.androidaps.database.entities.UserEntry.Action
|
import info.nightscout.androidaps.database.entities.UserEntry.Action
|
||||||
import info.nightscout.androidaps.database.entities.UserEntry.Sources
|
import info.nightscout.androidaps.database.entities.UserEntry.Sources
|
||||||
|
@ -48,7 +49,6 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
|
||||||
import info.nightscout.androidaps.utils.AndroidPermission
|
import info.nightscout.androidaps.utils.AndroidPermission
|
||||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
import info.nightscout.androidaps.utils.FabricPrivacy
|
||||||
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
||||||
import info.nightscout.androidaps.interfaces.BuildHelper
|
|
||||||
import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
|
import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
|
||||||
import info.nightscout.androidaps.utils.locale.LocaleHelper
|
import info.nightscout.androidaps.utils.locale.LocaleHelper
|
||||||
import info.nightscout.androidaps.utils.protection.PasswordCheck
|
import info.nightscout.androidaps.utils.protection.PasswordCheck
|
||||||
|
@ -349,7 +349,14 @@ class MainActivity : NoSplashAppCompatActivity() {
|
||||||
.setIcon(iconsProvider.getIcon())
|
.setIcon(iconsProvider.getIcon())
|
||||||
.setMessage(messageSpanned)
|
.setMessage(messageSpanned)
|
||||||
.setPositiveButton(rh.gs(R.string.ok), null)
|
.setPositiveButton(rh.gs(R.string.ok), null)
|
||||||
.setNeutralButton(rh.gs(R.string.cta_dont_kill_my_app_info)) { _, _ -> DokiActivity.start(context = this@MainActivity) }
|
.setNeutralButton(rh.gs(R.string.cta_dont_kill_my_app_info)) { _, _ ->
|
||||||
|
startActivity(
|
||||||
|
Intent(
|
||||||
|
Intent.ACTION_VIEW,
|
||||||
|
Uri.parse("https://dontkillmyapp.com/" + Build.MANUFACTURER.lowercase().replace(" ", "-"))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
.create().apply {
|
.create().apply {
|
||||||
show()
|
show()
|
||||||
findViewById<TextView>(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance()
|
findViewById<TextView>(android.R.id.message)?.movementMethod = LinkMovementMethod.getInstance()
|
||||||
|
@ -375,12 +382,12 @@ class MainActivity : NoSplashAppCompatActivity() {
|
||||||
})
|
})
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
R.id.nav_survey -> {
|
R.id.nav_survey -> {
|
||||||
startActivity(Intent(this, SurveyActivity::class.java))
|
startActivity(Intent(this, SurveyActivity::class.java))
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
R.id.nav_defaultprofile -> {
|
R.id.nav_defaultprofile -> {
|
||||||
startActivity(Intent(this, ProfileHelperActivity::class.java))
|
startActivity(Intent(this, ProfileHelperActivity::class.java))
|
||||||
return true
|
return true
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Name"
|
android:text="Name"
|
||||||
android:textSize="@dimen/twenty_four_dp"
|
android:textSize="24dp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
tools:ignore="HardcodedText" />
|
tools:ignore="HardcodedText" />
|
||||||
|
|
||||||
|
|
|
@ -56,11 +56,6 @@ dependencies {
|
||||||
// pumpCommon
|
// pumpCommon
|
||||||
api "com.google.code.gson:gson:$gson_version"
|
api "com.google.code.gson:gson:$gson_version"
|
||||||
|
|
||||||
// don't kill my app
|
|
||||||
api('dev.doubledot.doki:library:0.0.1@aar') {
|
|
||||||
transitive = true
|
|
||||||
}
|
|
||||||
|
|
||||||
//WorkManager
|
//WorkManager
|
||||||
api "androidx.work:work-runtime:$work_version"
|
api "androidx.work:work-runtime:$work_version"
|
||||||
api "androidx.work:work-runtime-ktx:$work_version"
|
api "androidx.work:work-runtime-ktx:$work_version"
|
||||||
|
|
Loading…
Add table
Reference in a new issue