sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove device name library

Browse source
This commit is contained in:
Phillip Thelen 2025-05-05 15:08:04 +02:00
parent 8510b55be0
commit 0fd8d7e55d
3 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle.kts
View file

@ -158,8 +158,6 @@ dependencies {
//Desugaring //Desugaring
coreLibraryDesugaring(libs.desugar) coreLibraryDesugaring(libs.desugar)
implementation(libs.device.names)
// IAP Handling / Verification // IAP Handling / Verification
implementation(libs.billing) implementation(libs.billing)

22
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
View file

@ -9,7 +9,6 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.lifecycle.lifecycleScope
import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
import com.habitrpg.android.habitica.databinding.KnownIssueBinding import com.habitrpg.android.habitica.databinding.KnownIssueBinding
@ -18,16 +17,13 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.common.habitica.helpers.AppTestingLevel import com.habitrpg.common.habitica.helpers.AppTestingLevel
import com.habitrpg.common.habitica.helpers.ExceptionHandler
import com.habitrpg.common.habitica.helpers.MainNavigationController import com.habitrpg.common.habitica.helpers.MainNavigationController
import com.jaredrummler.android.device.DeviceName
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
import androidx.core.net.toUri
@AndroidEntryPoint @AndroidEntryPoint
class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() { class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
private var deviceInfo: DeviceName.DeviceInfo? = null
override var binding: FragmentSupportBugFixBinding? = null override var binding: FragmentSupportBugFixBinding? = null
override fun createBinding( override fun createBinding(
@ -59,12 +55,6 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
) { ) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
lifecycleScope.launch(ExceptionHandler.coroutine()) {
DeviceName.with(context).request { info, _ ->
deviceInfo = info
}
}
binding?.reportBugButton?.setOnClickListener { binding?.reportBugButton?.setOnClickListener {
sendEmail("[Android] Bugreport") sendEmail("[Android] Bugreport")
} }
@ -89,7 +79,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
0 0
)?.versionName )?.versionName
?: "" ?: ""
} catch (e: PackageManager.NameNotFoundException) { } catch (_: PackageManager.NameNotFoundException) {
"" ""
} }
} }
@ -102,15 +92,15 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
0 0
)?.versionCode )?.versionCode
?: 0 ?: 0
} catch (e: PackageManager.NameNotFoundException) { } catch (_: PackageManager.NameNotFoundException) {
0 0
} }
} }
private fun sendEmail(subject: String) { private fun sendEmail(subject: String) {
val version = Build.VERSION.SDK_INT val version = Build.VERSION.SDK_INT
val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName() val deviceName = Build.MODEL
val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER val manufacturer = Build.MANUFACTURER
val newLine = "%0D%0A" val newLine = "%0D%0A"
var bodyOfEmail = var bodyOfEmail =
Uri.encode("Device: $manufacturer $deviceName") + Uri.encode("Device: $manufacturer $deviceName") +
@ -162,7 +152,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
"mailto:" + appConfigManager.supportEmail() + "mailto:" + appConfigManager.supportEmail() +
"?subject=" + Uri.encode(subject) + "?subject=" + Uri.encode(subject) +
"&body=" + bodyOfEmail "&body=" + bodyOfEmail
emailIntent.data = Uri.parse(mailto) emailIntent.data = mailto.toUri()
startActivity(Intent.createChooser(emailIntent, "Choose an Email client:")) startActivity(Intent.createChooser(emailIntent, "Choose an Email client:"))
} }

21
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
View file

@ -32,19 +32,16 @@ import com.habitrpg.android.habitica.ui.views.UsernameLabel
import com.habitrpg.common.habitica.extensions.dpToPx import com.habitrpg.common.habitica.extensions.dpToPx
import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.common.habitica.extensions.layoutInflater
import com.habitrpg.common.habitica.helpers.AppTestingLevel import com.habitrpg.common.habitica.helpers.AppTestingLevel
import com.habitrpg.common.habitica.helpers.ExceptionHandler
import com.habitrpg.common.habitica.helpers.MainNavigationController import com.habitrpg.common.habitica.helpers.MainNavigationController
import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.helpers.launchCatching
import com.habitrpg.common.habitica.models.PlayerTier import com.habitrpg.common.habitica.models.PlayerTier
import com.jaredrummler.android.device.DeviceName
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
import kotlin.math.max import kotlin.math.max
import androidx.core.net.toUri
@AndroidEntryPoint @AndroidEntryPoint
class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() { class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
private var deviceInfo: DeviceName.DeviceInfo? = null
override var binding: FragmentFaqOverviewBinding? = null override var binding: FragmentFaqOverviewBinding? = null
@Inject @Inject
@ -73,7 +70,7 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
0 0
)?.versionName )?.versionName
?: "" ?: ""
} catch (e: PackageManager.NameNotFoundException) { } catch (_: PackageManager.NameNotFoundException) {
"" ""
} }
} }
@ -86,7 +83,7 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
0 0
)?.versionCode )?.versionCode
?: 0 ?: 0
} catch (e: PackageManager.NameNotFoundException) { } catch (_: PackageManager.NameNotFoundException) {
0 0
} }
} }
@ -112,12 +109,6 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
binding?.npcHeader?.namePlate?.setText(R.string.tavern_owner) binding?.npcHeader?.namePlate?.setText(R.string.tavern_owner)
binding?.npcHeader?.descriptionView?.isVisible = false binding?.npcHeader?.descriptionView?.isVisible = false
lifecycleScope.launch(ExceptionHandler.coroutine()) {
DeviceName.with(context).request { info, _ ->
deviceInfo = info
}
}
binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap( binding?.healthSection?.findViewById<ImageView>(R.id.icon_view)?.setImageBitmap(
HabiticaIconsHelper.imageOfHeartLarge() HabiticaIconsHelper.imageOfHeartLarge()
) )
@ -203,8 +194,8 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
private fun sendEmail(subject: String) { private fun sendEmail(subject: String) {
val version = Build.VERSION.SDK_INT val version = Build.VERSION.SDK_INT
val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName() val deviceName = Build.MODEL
val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER val manufacturer = Build.MANUFACTURER
val newLine = "%0D%0A" val newLine = "%0D%0A"
var bodyOfEmail = var bodyOfEmail =
Uri.encode("Device: $manufacturer $deviceName") + Uri.encode("Device: $manufacturer $deviceName") +
@ -256,7 +247,7 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
"mailto:" + appConfigManager.supportEmail() + "mailto:" + appConfigManager.supportEmail() +
"?subject=" + Uri.encode(subject) + "?subject=" + Uri.encode(subject) +
"&body=" + bodyOfEmail "&body=" + bodyOfEmail
emailIntent.data = Uri.parse(mailto) emailIntent.data = mailto.toUri()
startActivity(Intent.createChooser(emailIntent, "Choose an Email client:")) startActivity(Intent.createChooser(emailIntent, "Choose an Email client:"))
} }