sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-14 02:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Design fixes

Browse source
This commit is contained in:
Phillip Thelen 2022-01-31 13:54:01 +01:00
parent c6305d9121
commit 2e654c9c63
7 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/res/layout/fragment_gem_purchase.xml
View file

@ -233,11 +233,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:paddingStart="41dp" android:paddingStart="41dp"
android:paddingEnd="41dp" android:paddingEnd="41dp"
android:paddingBottom="20dp" android:paddingBottom="30dp"
android:paddingTop="70dp" android:paddingTop="70dp"
android:text="@string/gem_purchase_title" android:text="@string/gem_purchase_title"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center" android:gravity="center"
android:lineSpacingExtra="3dp"
android:textColor="@color/white" android:textColor="@color/white"
style="@style/Caption2" style="@style/Caption2"
android:drawablePadding="@dimen/spacing_medium"/> android:drawablePadding="@dimen/spacing_medium"/>

42
Habitica/res/layout/purchase_gem_view.xml
View file

@ -17,19 +17,37 @@
android:contentDescription="@string/gems" android:contentDescription="@string/gems"
android:layout_marginTop="20dp"/> android:layout_marginTop="20dp"/>
<com.habitrpg.android.habitica.ui.views.DayNightTextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/gem_amount" android:orientation="horizontal">
app:dayTextColor="@color/white" <com.habitrpg.android.habitica.ui.views.DayNightTextView
app:nightTextColor="@color/white" android:layout_width="wrap_content"
android:gravity="center" android:layout_height="wrap_content"
android:layout_gravity="center" android:id="@+id/gem_amount"
android:textSize="16sp" app:dayTextColor="@color/white"
android:letterSpacing="0.027" app:nightTextColor="@color/white"
android:fontFamily="@string/font_family_medium" android:gravity="center"
android:layout_margin="10dp" android:layout_gravity="center"
tools:text="21 GEMS" /> android:textSize="16sp"
android:letterSpacing="0.03"
android:fontFamily="@string/font_family_medium"
android:layout_marginVertical="10dp"
android:layout_marginEnd="2dp"
tools:text="21" />
<com.habitrpg.android.habitica.ui.views.DayNightTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:dayTextColor="@color/white"
app:nightTextColor="@color/white"
android:gravity="center"
android:layout_gravity="center"
android:textSize="16sp"
android:letterSpacing="0.03"
android:layout_marginVertical="10dp"
android:textAllCaps="true"
android:text="@string/gems" />
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -38,7 +56,7 @@
android:background="@drawable/purchase_button_background" android:background="@drawable/purchase_button_background"
android:textColor="@color/brand_400" android:textColor="@color/brand_400"
android:gravity="center" android:gravity="center"
android:textSize="16sp" style="@style/Subheader1"
android:letterSpacing="0.02" android:letterSpacing="0.02"
android:layout_marginStart="@dimen/spacing_medium" android:layout_marginStart="@dimen/spacing_medium"
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"

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

@ -374,7 +374,7 @@
<string name="google_services_missing">Google play services could not be found.</string> <string name="google_services_missing">Google play services could not be found.</string>
<string name="gem_purchase_toolbartitle">Purchase</string> <string name="gem_purchase_toolbartitle">Purchase</string>
<string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string> <string name="gem_purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
<string name="gem_purchase_subtitle">Gems allow you to buy fun extras for your account:</string> <string name="gem_purchase_subtitle">Gems allow you to buy fun extras for your account</string>
<string name="gem_purchase_listitem1">Cool costumes for your avatar</string> <string name="gem_purchase_listitem1">Cool costumes for your avatar</string>
<string name="gem_purchase_listitem2">Awesome backgrounds</string> <string name="gem_purchase_listitem2">Awesome backgrounds</string>
<string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string> <string name="gem_purchase_listitem3">Quests that reward you with pet eggs</string>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.kt
View file

@ -20,7 +20,7 @@ class GemPurchaseOptionsView(context: Context, attrs: AttributeSet) : FrameLayou
0, 0 0, 0
) )
binding.gemAmount.text = "${a.getText(R.styleable.GemPurchaseOptionsView_gemAmount)} GEMS" binding.gemAmount.text = a.getText(R.styleable.GemPurchaseOptionsView_gemAmount)
val iconRes = a.getDrawable(R.styleable.GemPurchaseOptionsView_gemDrawable) val iconRes = a.getDrawable(R.styleable.GemPurchaseOptionsView_gemDrawable)
if (iconRes != null) { if (iconRes != null) {

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

@ -215,8 +215,8 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe( .subscribe(
{ {
binding?.recyclerView?.scrollToPosition(0)
viewModel.invalidateDataSource() viewModel.invalidateDataSource()
binding?.recyclerView?.scrollToPosition(0)
}, },
{ error -> { error ->
RxErrorHandler.reportError(error) RxErrorHandler.reportError(error)

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
View file

@ -11,6 +11,7 @@ import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toDrawable import androidx.core.graphics.drawable.toDrawable
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.FirebaseAnalytics
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.InventoryRepository
@ -319,6 +320,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
} }
private fun buyItem(quantity: Int) { private fun buyItem(quantity: Int) {
val application = ownerActivity?.application as? HabiticaBaseApplication
FirebaseAnalytics.getInstance(context).logEvent( FirebaseAnalytics.getInstance(context).logEvent(
"item_purchased", "item_purchased",
bundleOf( bundleOf(
@ -373,7 +375,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
"hourglasses" -> ContextCompat.getColor(context, R.color.text_brand) "hourglasses" -> ContextCompat.getColor(context, R.color.text_brand)
else -> 0 else -> 0
} }
(ownerActivity as? SnackbarActivity)?.showSnackbar( ((application?.currentActivity?.get() ?: getActivity() ?: ownerActivity) as? SnackbarActivity)?.showSnackbar(
content = text, content = text,
rightIcon = priceLabel.compoundDrawables[0], rightIcon = priceLabel.compoundDrawables[0],
rightTextColor = rightTextColor, rightTextColor = rightTextColor,

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
View file

@ -158,7 +158,12 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
private fun configureTaskView(taskView: View, task: Task) { private fun configureTaskView(taskView: View, task: Task) {
val completed = !task.isDisplayedActive val completed = !task.isDisplayedActive
val checkmark = taskView.findViewById<View>(R.id.checkmark) val checkmark = taskView.findViewById<ImageView>(R.id.checkmark)
if (task.completed) {
checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.gray_400))
} else {
checkmark?.drawable?.setTint(ContextCompat.getColor(context, task.darkestTaskColor))
}
val checkboxHolder = taskView.findViewById<View>(R.id.checkBoxHolder) val checkboxHolder = taskView.findViewById<View>(R.id.checkBoxHolder)
val checkboxBackground = taskView.findViewById<View>(R.id.checkbox_background) val checkboxBackground = taskView.findViewById<View>(R.id.checkbox_background)
checkmark?.visibility = if (completed) View.VISIBLE else View.GONE checkmark?.visibility = if (completed) View.VISIBLE else View.GONE