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

layout fixes

Browse source
This commit is contained in:
Phillip Thelen 2025-03-24 13:20:56 +01:00
parent 297cea8b3e
commit 58c1400466
8 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Habitica/res/layout/activity_armoire.xml
View file

@ -11,6 +11,7 @@
android:layout_height="match_parent" />
<LinearLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"

1
Habitica/res/layout/activity_death.xml
View file

@ -16,6 +16,7 @@
android:fillViewport="true">
<LinearLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="edge_to_edge">true</bool>
<bool name="edge_to_edge">false</bool>
<string-array name="repeatables_frequencies">
<item>@string/repeatables_frequency_daily</item>

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
View file

@ -11,6 +11,7 @@ import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
import com.habitrpg.android.habitica.R
@ -43,7 +44,6 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.launch
import javax.inject.Inject
import androidx.core.view.isVisible
@AndroidEntryPoint
class ArmoireActivity : BaseActivity() {
@ -124,6 +124,15 @@ class ArmoireActivity : BaseActivity() {
}
}
ViewCompat.setOnApplyWindowInsetsListener(binding.mainContent) { v, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout())
v.updatePadding(top = insets.top)
binding.unsubbedWrapper.updatePadding(bottom = insets.bottom)
binding.dropRateButton.updatePadding(bottom = insets.bottom)
consumeWindowInsetsAbove30(windowInsets)
}
binding.progressView.setContent {
HabiticaCircularProgressView(indicatorSize = 60.dp)
}

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
View file

@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.activities
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
@ -82,6 +83,11 @@ class ClassSelectionActivity : BaseActivity() {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
window.isNavigationBarContrastEnforced = false
}
val args = navArgs<ClassSelectionActivityArgs>().value
isClassSelected = args.isClassSelected
currentClass = args.className

15
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
View file

@ -25,13 +25,17 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.content.edit
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import androidx.lifecycle.lifecycleScope
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.data.InventoryRepository
import com.habitrpg.android.habitica.databinding.ActivityDeathBinding
import com.habitrpg.android.habitica.extensions.DateUtils
import com.habitrpg.android.habitica.extensions.consumeWindowInsetsAbove30
import com.habitrpg.android.habitica.extensions.getShortRemainingString
import com.habitrpg.android.habitica.helpers.AdHandler
import com.habitrpg.android.habitica.helpers.AdType
@ -94,6 +98,17 @@ class DeathActivity : BaseActivity(), SnackbarActivity {
binding.brokenEquipmentDescription.isVisible = !appConfigManager.showAltDeathText()
ViewCompat.setOnApplyWindowInsetsListener(binding.mainContent) { v, windowInsets ->
val insets = windowInsets.getInsets(
WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout())
v.updatePadding(top = insets.top,
left = insets.left,
right = insets.right,
bottom = insets.bottom)
consumeWindowInsetsAbove30(windowInsets)
}
userViewModel.user.observeOnce(this) { user ->
binding.lossDescription.text =
getString(

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
View file

@ -5,7 +5,6 @@ import android.content.Intent
import android.content.SharedPreferences
import android.content.res.ColorStateList
import android.graphics.drawable.GradientDrawable
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -154,7 +153,8 @@ class NavigationDrawerFragment : DialogFragment() {
binding?.menuHeaderView?.let {
ViewCompat.setOnApplyWindowInsetsListener(it) { v, windowInsets ->
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout())
v.updatePadding(top = insets.top)
consumeWindowInsetsAbove30(windowInsets)
}
@ -731,7 +731,7 @@ class NavigationDrawerFragment : DialogFragment() {
openDrawer()
}
} else {
containerView?.isVisible = containerView.isVisible != true
containerView?.isVisible = containerView?.isVisible != true
}
}

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.7.3
CODE=12501
CODE=12511