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

Merge pull request #1850 from Hafizzle/Hafiz/update-sub-benefit-ui

Browse source 
Updated subscription benefit screen UI
This commit is contained in:
Phillip Thelen 2022-12-05 17:51:49 +01:00 committed by GitHub
commit bf3370b821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 409 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Habitica/res/drawable/calendar_ic.xml Normal file
View file

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20.571,3.429V0h-3.428v3.429H6.857V0H3.43v3.429A3.428,3.428 0,0 0,0 6.857v13.714A3.428,3.428 0,0 0,3.429 24H20.57A3.428,3.428 0,0 0,24 20.571V6.857a3.428,3.428 0,0 0,-3.429 -3.428z"
android:fillColor="#9A62FF"
android:fillType="evenOdd"/>
<path
android:pathData="M3.429,20.571H20.57V10.286H3.43z"
android:fillColor="#D5C8FF"
android:fillType="evenOdd"/>
<path
android:pathData="M3.429,13.286H20.57v-3H3.43z"
android:fillColor="#9A62FF"
android:fillType="evenOdd"/>
<path
android:pathData="M3.429,13.286H20.57v-3H3.43z"
android:fillColor="#BDA8FF"
android:fillType="evenOdd"/>
</vector>

40
Habitica/res/drawable/gem_ic.xml Normal file
View file

@ -0,0 +1,40 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="m0,9 l5,-7h14l5,7 -12,13z"
android:fillColor="#24CC8F"
android:fillType="evenOdd"/>
<path
android:pathData="M7,8.8 L6,4h6zM17,8.8L18,4h-6z"
android:strokeAlpha="0.25"
android:fillColor="#FFF"
android:fillType="evenOdd"
android:fillAlpha="0.25"/>
<path
android:pathData="M7,8.8 L12,4l5,4.8zM2.6,8.8L6,4l1,4.8z"
android:strokeAlpha="0.5"
android:fillColor="#FFF"
android:fillType="evenOdd"
android:fillAlpha="0.5"/>
<path
android:pathData="M21.4,8.8 L18,4l-1,4.8zM2.6,8.8L7,8.8l5,10.3z"
android:strokeAlpha="0.11"
android:fillColor="#34313A"
android:fillType="evenOdd"
android:fillAlpha="0.11"/>
<path
android:pathData="M21.4,8.8H17l-5,10.3z"
android:strokeAlpha="0.5"
android:fillColor="#FFF"
android:fillType="evenOdd"
android:fillAlpha="0.5"/>
<path
android:pathData="M7,8.8h10l-5,10.3z"
android:strokeAlpha="0.25"
android:fillColor="#FFF"
android:fillType="evenOdd"
android:fillAlpha="0.25"/>
</vector>

BIN
Habitica/res/drawable/hourglass_fancy_left.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
Habitica/res/drawable/hourglass_fancy_right.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.7 KiB

485
Habitica/res/layout/subscription_details.xml
View file

@ -1,226 +1,335 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/subscriptionDetails"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="?attr/colorContentBackground">
android:orientation="vertical"
tools:background="@color/content_background">
<com.google.android.material.card.MaterialCardView
android:id="@+id/subscription_credit_card"
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:cardCornerRadius="8dp"
app:strokeColor="@color/green_50"
app:strokeWidth="1dp">
<TextView
android:id="@+id/subscription_credit_text_view"
style="@style/subscriptionBoxText.Subtitle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:padding="4dp"
android:text="@string/subscription_credit_canceling"
android:textColor="@color/green_50" />
</com.google.android.material.card.MaterialCardView>
<LinearLayout
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
style="@style/subscriptionBoxText.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/subscription" />
<TextView
android:id="@+id/subscriptionDurationTextView"
style="@style/subscriptionBoxText.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Recurring every 3 months" />
</LinearLayout>
<TextView
android:id="@+id/subscriptionStatusActive"
style="@style/Pill.Selected.Green"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/active" />
<TextView
android:id="@+id/subscriptionStatusNotRecurring"
style="@style/Pill.Selected.Yellow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/not_recurring"
android:visibility="gone" />
<TextView
android:id="@+id/subscriptionStatusInactive"
style="@style/Pill.Selected.Red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/inactive"
android:visibility="gone" />
<TextView
android:id="@+id/subscriptionStatusCancelled"
style="@style/Pill.Selected.Red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/cancelled"
android:visibility="gone" />
<TextView
android:id="@+id/subscription_status_group_plan"
style="@style/Pill.Selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/group_plan"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:id="@+id/payment_processor_wrapper"
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
style="@style/subscriptionBoxText.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/payment_method" />
<TextView
android:id="@+id/subscription_payment_method_textview"
style="@style/subscriptionBoxText.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Recurring every 3 months" />
</LinearLayout>
<ImageView
android:id="@+id/paymentProcessorImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View
android:id="@+id/divider"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/months_subscribed_layout"
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginBottom="6dp"
android:layout_toStartOf="@id/divider">
<View
android:id="@+id/months_divider"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true" />
<ImageView
android:id="@+id/calendar_icon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginTop="8dp"
android:layout_toStartOf="@id/months_divider"
android:src="@drawable/calendar_ic" />
<TextView
style="@style/subscriptionBoxCompactText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/calendar_icon"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"
android:text="@string/months_subscribed" />
<TextView
android:id="@+id/monthsSubscribedTextView"
style="@style/subscriptionBoxCompactNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_toEndOf="@id/calendar_icon"
android:gravity="center"
tools:text="2" />
</RelativeLayout>
<RelativeLayout
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginBottom="6dp"
android:layout_toEndOf="@id/divider">
<View
android:id="@+id/gem_divider"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerInParent="true" />
<ImageView
android:id="@+id/gem_icon"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginTop="10dp"
android:layout_toStartOf="@id/gem_divider"
android:src="@drawable/gem_ic" />
<TextView
style="@style/subscriptionBoxCompactText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/gem_icon"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="@string/monthly_gem_cap" />
<TextView
android:id="@+id/gemCapTextView"
style="@style/subscriptionBoxCompactNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="10dp"
android:layout_toEndOf="@id/gem_icon"
tools:text="50" />
</RelativeLayout>
<RelativeLayout
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/months_subscribed_layout">
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:src="@drawable/hourglass_fancy_left" />
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:src="@drawable/hourglass_fancy_right" />
<TextView
android:id="@+id/next_hourglass_textview"
style="@style/subscriptionBoxCompactTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="16dp"
tools:text="4" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/next_hourglass_textview"
android:layout_centerHorizontal="true"
android:fontFamily="sans-serif-medium"
android:text="@string/next_hourglass"
android:textColor="@color/text_primary" />
</RelativeLayout>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:fontFamily="sans-serif"
android:gravity="center"
android:paddingStart="50dp"
android:paddingEnd="50dp"
android:text="@string/subscribers_mythic_hourglasses" />
<ImageView
android:id="@+id/heart_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_horizontal"/>
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/thanks_for_subscribing"
style="@style/Body2"
android:textColor="@color/text_quad"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp"
android:layout_marginTop="4dp"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/subscriptionBox">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/subscription"
style="@style/subscriptionBoxText.Title"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/subscriptionDurationTextView"
tools:text="Recurring every 3 months"
style="@style/subscriptionBoxText.Subtitle" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/active"
style="@style/Pill.Selected.Green"
android:id="@+id/subscriptionStatusActive"
android:layout_gravity="center_vertical"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/not_recurring"
style="@style/Pill.Selected.Yellow"
android:id="@+id/subscriptionStatusNotRecurring"
android:layout_gravity="center_vertical"
android:visibility="gone"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/inactive"
style="@style/Pill.Selected.Red"
android:id="@+id/subscriptionStatusInactive"
android:layout_gravity="center_vertical"
android:visibility="gone"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancelled"
style="@style/Pill.Selected.Red"
android:id="@+id/subscriptionStatusCancelled"
android:layout_gravity="center_vertical"
android:visibility="gone"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/group_plan"
style="@style/Pill.Selected"
android:id="@+id/subscription_status_group_plan"
android:layout_gravity="center_vertical"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout
android:id="@+id/payment_processor_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/subscriptionBox">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/payment_method"
style="@style/subscriptionBoxText.Title" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/subscription_payment_method_textview"
tools:text="Recurring every 3 months"
style="@style/subscriptionBoxText.Subtitle" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/paymentProcessorImageView"
android:layout_gravity="center_vertical"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/subscriptionBox"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/current_bonuses"
style="@style/subscriptionBoxText.Title"
android:layout_marginBottom="4dp"/>
<LinearLayout
android:id="@+id/subscription_credit_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/subscription_credit"
style="@style/subscriptionBoxText.Subtitle"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Pill"
android:id="@+id/subscription_credit_text_view"
tools:text="32 Months" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/months_subscribed"
style="@style/subscriptionBoxText.Subtitle"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Pill"
android:id="@+id/monthsSubscribedTextView"
tools:text="32 Months" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/monthly_gem_cap"
style="@style/subscriptionBoxText.Subtitle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Pill"
android:id="@+id/gemCapTextView"
tools:text="50 Gems" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/next_hourglass"
style="@style/subscriptionBoxText.Subtitle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Pill"
android:id="@+id/next_hourglass_textview"
tools:text="4" />
</LinearLayout>
</LinearLayout>
android:layout_marginBottom="12dp"
android:fontFamily="sans-serif-medium"
android:text="@string/thanks_for_supporting"
android:textColor="@color/text_quad" />
<LinearLayout
android:id="@+id/change_subscription_wrapper"
style="@style/subscriptionBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/subscriptionBox"
android:orientation="vertical">
<TextView
android:id="@+id/change_subscription_title"
style="@style/subscriptionBoxText.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/cancel_subscription"
style="@style/subscriptionBoxText.Title" />
android:text="@string/cancel_subscription" />
<TextView
android:id="@+id/change_subscription_description"
style="@style/subscriptionBoxText.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/subscriptionBoxText.Subtitle"
android:text="@string/cancel_subscription_notgoogle_description"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"/>
android:layout_marginBottom="8dp"
android:text="@string/cancel_subscription_notgoogle_description" />
<Button
android:id="@+id/change_subscription_button"
style="@style/HabiticaButton.Yellow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/visit_website"
android:layout_gravity="center"
style="@style/HabiticaButton.Purple"
android:layout_marginTop="@dimen/spacing_medium"/>
</LinearLayout>

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

@ -733,7 +733,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
<string name="resubscribe_description">Willst Du weiter Deine Vorteile genießen\? Du kannst ein neues Abonnement abschließen, bevor dieses ausläuft, um Deine Vorteile zu behalten.</string>
<string name="resubscribe">Erneut abonnieren</string>
<string name="renew_subscription">Abonnement erneuern</string>
<string name="thanks_for_subscribing">Danke für das Abonnieren</string>
<string name="thanks_for_supporting">Danke für das Abonnieren</string>
<string name="subscribe_options_title">Wähle die Abonnementlänge, die für Dich passt</string>
<string name="ending_on">Endet am %s</string>
<string name="not_recurring">Einmalig</string>

2
Habitica/res/values-en-rGB/strings.xml
View file

@ -709,7 +709,7 @@
<string name="resubscribe_description">Want to continue your benefits\? You can start a new subscription before this one runs out to keep your benefits active.</string>
<string name="resubscribe">Resubscribe</string>
<string name="renew_subscription">Renew Subscription</string>
<string name="thanks_for_subscribing">Thanks for subscribing</string>
<string name="thanks_for_supporting">Thanks for subscribing</string>
<string name="subscribe_options_title">Choose the Subscription length that works for you</string>
<string name="ending_on">Ending on %s</string>
<string name="not_recurring">Not Recurring</string>

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

@ -722,7 +722,7 @@
<string name="party_invite_short">Invitar amigos</string>
<string name="login_incentive_count">Desbloqueado al conectarse en Habitica %d veces.</string>
<string name="user_level_with_class_unabbreviated">Nivel %1$d %2$s</string>
<string name="thanks_for_subscribing">Gracias por suscribirte</string>
<string name="thanks_for_supporting">Gracias por suscribirte</string>
<string name="subscribe_options_title">Elige el tiempo de suscripción que mejor funcione para tí</string>
<string name="cancelled">Cancelado</string>
<string name="send_invites">Enviar invitaciones</string>

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

@ -908,7 +908,7 @@
<string name="resubscribe_description">Vous voulez encore profiter des bonus \? Vous pouvez commencer un nouvel abonnement avant que celui-ci ne se termine pour les conserver.</string>
<string name="resubscribe">Se réinscrire</string>
<string name="renew_subscription">Renouveler l\'abonnement</string>
<string name="thanks_for_subscribing">Merci d\'avoir souscrit un abonnement</string>
<string name="thanks_for_supporting">Merci d\'avoir souscrit un abonnement</string>
<string name="subscribe_options_title">Choisissez la durée d\'abonnement qui marche pour vous</string>
<string name="ending_on">Termine le %s</string>
<string name="not_recurring">Ne se renouvelle pas</string>

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

@ -917,7 +917,7 @@
<string name="gifted">Telah diberikan</string>
<string name="resubscribe">Berlangganan Kembali</string>
<string name="renew_subscription">Memperbarui Berlangganan</string>
<string name="thanks_for_subscribing">Terima kasih telah berlangganan</string>
<string name="thanks_for_supporting">Terima kasih telah berlangganan</string>
<string name="subscribe_options_title">Pilih masa Berlangganan yang kamu inginkan</string>
<string name="ending_on">Berakhir pada %s</string>
<string name="not_recurring">Tidak Berulang</string>

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

@ -908,7 +908,7 @@
<string name="resubscribe_description">Vuoi continuare ad avere i tuoi vantaggi\? Puoi iniziare un nuovo abbonamento prima che questo scada per mantenerli attivi.</string>
<string name="resubscribe">Riabbonati</string>
<string name="renew_subscription">Rinnova l\'Abbonamento</string>
<string name="thanks_for_subscribing">Grazie per esserti iscritto</string>
<string name="thanks_for_supporting">Grazie per esserti iscritto</string>
<string name="subscribe_options_title">Scegli la durata dell\'abbonamento che fa per te</string>
<string name="ending_on">Termina il %s</string>
<string name="not_recurring">Non ricorrente</string>

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

@ -897,7 +897,7 @@
<string name="resubscribe_description">特典を受け続けたいですか？この有料プランの有効期限が切れる前に新しい有料プランをはじめることで、特典を有効に受け続けられます。</string>
<string name="resubscribe">有料プランの再開</string>
<string name="renew_subscription">有料プランを再開する</string>
<string name="thanks_for_subscribing">有料プランにご加入いただきありがとうございます</string>
<string name="thanks_for_supporting">有料プランにご加入いただきありがとうございます</string>
<string name="subscribe_options_title">有料プランの期間をあなたのご都合に合わせて選びましょう</string>
<string name="ending_on">%sに止める</string>
<string name="not_recurring">くり返さない</string>

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

@ -911,7 +911,7 @@
<string name="resubscribe_description">혜택을 계속 받고 싶으신가요\? 이번 구독기간이 끝나기 전에 새로 시작하시면 현재 받고 계신 혜택을 계속 유지시킬 수 있습니다.</string>
<string name="resubscribe">재구독</string>
<string name="renew_subscription">구독 갱신</string>
<string name="thanks_for_subscribing">구독해주셔서 감사합니다</string>
<string name="thanks_for_supporting">구독해주셔서 감사합니다</string>
<string name="subscribe_options_title">원하시는 구독 기간을 정하세요</string>
<string name="ending_on">%s 에 종료</string>
<string name="not_recurring">자동 반복 안됨</string>

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

@ -751,7 +751,7 @@
<string name="copy_userid">Gebruikers ID kopiëren</string>
<string name="resubscribe">Opnieuw abonneren</string>
<string name="renew_subscription">Abonnement vernieuwen</string>
<string name="thanks_for_subscribing">Bedankt voor het abonneren</string>
<string name="thanks_for_supporting">Bedankt voor het abonneren</string>
<string name="subscribe_options_title">Kies de abonnementslengte die voor u werkt</string>
<string name="ending_on">Eindigend op %s</string>
<string name="not_recurring">Niet Terugkerend</string>

2
Habitica/res/values-pt-rBR/strings.xml
View file

@ -709,7 +709,7 @@
<string name="resubscribe_description">Você quer continuar com seus benefícios\? Você pode iniciar uma nova assinatura antes que esta acabe para manter seus benefícios ativos.</string>
<string name="resubscribe">Assinar novamente</string>
<string name="renew_subscription">Renovar assinatura</string>
<string name="thanks_for_subscribing">Obrigado por assinar</string>
<string name="thanks_for_supporting">Obrigado por assinar</string>
<string name="subscribe_options_title">Escolha o tempo de assinatura que funciona para você</string>
<string name="ending_on">Finalizando em %s</string>
<string name="not_recurring">Não recorrente</string>

2
Habitica/res/values-pt-rPT/strings.xml
View file

@ -710,7 +710,7 @@
<string name="subscription_credit">Crédito de Subscrição</string>
<string name="save_20">Economize 20%</string>
<string name="renew_subscription">Renovar Subscrição</string>
<string name="thanks_for_subscribing">Obrigado por subscrever-se</string>
<string name="thanks_for_supporting">Obrigado por subscrever-se</string>
<string name="class_equipment">Equipamento</string>
<string name="allocating_points">Distribuindo Pontos</string>
<string name="distribute_task_help">Distribui pontos baseado nas categorias Força, Inteligência, Constituição e Percepção associadas com as tarefas que completastes.</string>

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

@ -954,7 +954,7 @@
<string name="usually_x_gems">Обычно %d самоцветов</string>
<string name="resubscribe">Подписаться снова</string>
<string name="renew_subscription">Обновить подписку</string>
<string name="thanks_for_subscribing">Благодарим за подписку</string>
<string name="thanks_for_supporting">Благодарим за подписку</string>
<string name="gifted">Подарено</string>
<string name="number_responded">Ответ от %1$d/%2$d</string>
<string name="ending_on">Заканчивается %s</string>

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

@ -564,7 +564,7 @@
<string name="g1g1_duration">Dec 17 till Jan 6</string>
<string name="resubscribe">Abonnera igen</string>
<string name="copy_username">Kopiera Användarnamn</string>
<string name="thanks_for_subscribing">Tack för att du prenumererar</string>
<string name="thanks_for_supporting">Tack för att du prenumererar</string>
<string name="ending_on">Sluta på %s</string>
<string name="view_achievements">Visa Prestationer</string>
<string name="purchase">Köpa</string>

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

@ -961,7 +961,7 @@
<string name="resubscribe_description">Faydalardan yararlanmaya devam etmek ister misin\? Faydalarını etkin tutmak için bu abonelik bitmeden yeni bir abonelik başlatabilirsin.</string>
<string name="renew_subscription">Aboneliği Yenile</string>
<string name="resubscribe">Yeniden abone ol</string>
<string name="thanks_for_subscribing">Abone olduğun için teşekkürler</string>
<string name="thanks_for_supporting">Abone olduğun için teşekkürler</string>
<string name="not_recurring">Yinelenmiyor</string>
<string name="cancelled">İptal Edildi</string>
<string name="send_invites">Davet Gönder</string>

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

@ -857,7 +857,7 @@
<string name="group_plan">Груповий план</string>
<string name="resubscribe_description">Хочеш надалі використовувати свої переваги\? Ти можеш розпочати нову підписку до закінчення актуальної підтиски, щоб зберегти свої переваги.</string>
<string name="subscribe_options_title">Вибери час підписки, який тобі найбільше підходить</string>
<string name="thanks_for_subscribing">Дякуємо за підписку</string>
<string name="thanks_for_supporting">Дякуємо за підписку</string>
<string name="resubscribe">Підписатися знову</string>
<string name="renew_subscription">Оновити підписку</string>
<string name="save_20">Заощадити 20%</string>

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

@ -868,7 +868,7 @@
<string name="resubscribe_description">Muốn tiếp tục những lợi ích của bạn\? Bạn có thể bắt đầu một Gói đăng ký mới trước khi cái này kết thúc để giữ những lợi ích của bạn được hoạt động.</string>
<string name="resubscribe">Đăng ký lại</string>
<string name="renew_subscription">Làm mới Gói đăng ký</string>
<string name="thanks_for_subscribing">Cảm ơn vì đăng ký</string>
<string name="thanks_for_supporting">Cảm ơn vì đăng ký</string>
<string name="subscribe_options_title">Chọn độ dài Gói đăng ký mà thích hợp với bạn</string>
<string name="ending_on">Kết thúc vào %s</string>
<string name="not_recurring">Không lặp lại</string>

2
Habitica/res/values-zh-rTW/strings.xml
View file

@ -863,7 +863,7 @@
<string name="not_recurring">不重複</string>
<string name="ending_on">在%s結束</string>
<string name="subscribe_options_title">選擇最適合的訂閱計劃</string>
<string name="thanks_for_subscribing">感謝您的訂閱</string>
<string name="thanks_for_supporting">感謝您的訂閱</string>
<string name="renew_subscription">更新訂閱</string>
<string name="resubscribe">重新訂閱</string>
<string name="resubscribe_description">要繼續用您的訂閱增值？您可以在現在的訂閱結束前開始新的訂閱，就能繼續使用。</string>

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

@ -842,7 +842,7 @@
<string name="not_recurring">不重复</string>
<string name="ending_on">在%s结束</string>
<string name="subscribe_options_title">选择最适合的订阅计划</string>
<string name="thanks_for_subscribing">感谢您的订阅</string>
<string name="thanks_for_supporting">感谢您的订阅</string>
<string name="renew_subscription">更新订阅</string>
<string name="resubscribe">重新订阅</string>
<string name="resubscribe_description">要继续用您的订阅增值？您可以在现在的订阅结束前开始新的订阅，就能继续使用。</string>

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

@ -306,7 +306,7 @@
<string name="share_levelup">I got to level %d in #Habitica by improving my real-life habits!</string>
<string name="share_hatched">I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!</string>
<string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
<string name="open_in_store">Open in play store</string>
<string name="open_in_store">Open Play Store</string>
<string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
<string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
<string name="confirm">Confirm</string>
@ -365,7 +365,7 @@
<string name="belongs_to_challenge">Belongs to Challenge</string>
<string name="has_reminder">Has Reminder</string>
<string name="has_tag">Has Tag</string>
<string name="subscribe_title">Subscribing supports the developers and helps keep Habitica running</string>
<string name="subscribe_title">Subscribing supports our small team and help keeps Habitica running, thank you!</string>
<string name="subscribe_prompt">Become a subscriber to receive these exclusive benefits!</string>
<string name="subscribe_listitem1">Gold for Gems</string>
<string name="subscribe_listitem2">Mystic Hourglasses</string>
@ -389,17 +389,18 @@
<string name="subscription_hourglasses">+%d Mystic Hourglass</string>
<string name="payment_method">Payment method</string>
<string name="subscription">Subscription</string>
<string name="subscription_credit_canceling">"Your <b>+%d</b> months of subscription credit will activate after canceling</string>
<string name="active">Active</string>
<string name="due">Due</string>
<string name="cancel_subscription">Cancel Subscription</string>
<string name="cancel_subscription_google_description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store. Any months of subscription credit will be applied after your subscription has ended.</string>
<string name="cancel_subscription_google_description">You can cancel your subscription from the Google Play Store app. Any months of Subscription credit will be applied after your recurring Subscription has ended.</string>
<string name="cancel_subscription_notgoogle_description">No longer want to subscribe? Due to constraints on mobile payments, you\'ll need to cancel via our website. To do this, tap the button below, log in to your account, tap the User icon in the top right, then go to Subscription. Any months of subscription credit will be applied after your subscription has ended. We\'ll miss you!</string>
<string name="visit_habitica_website">Visit Habitica Website</string>
<string name="current_bonuses">Current Bonuses</string>
<string name="months_subscribed">Months subscribed</string>
<string name="months_subscribed">Months Subscribed</string>
<string name="current_hourclasses">Current Mystic Hourglasses</string>
<string name="next_hourglass">Next Hourglass</string>
<string name="monthly_gem_cap">Monthly gem cap</string>
<string name="next_hourglass">Next Hourglass delivery</string>
<string name="monthly_gem_cap">Monthly Gem Cap</string>
<string name="inactive">Inactive</string>
<string name="one_month">1 Month</string>
<string name="x_months">%d Months</string>
@ -910,7 +911,8 @@
<string name="not_recurring">Not Recurring</string>
<string name="ending_on">Ending on %s</string>
<string name="subscribe_options_title">Choose the Subscription length that works for you</string>
<string name="thanks_for_subscribing">Thanks for subscribing</string>
<string name="thanks_for_supporting">Thanks for supporting Habitica</string>
<string name="subscribers_mythic_hourglasses"><i>Subscribers receive Mystic Hourglasses within the first three days of the month.</i></string>
<string name="renew_subscription">Renew Subscription</string>
<string name="resubscribe">Resubscribe</string>
<string name="resubscribe_description">Want to continue your benefits? You can start a new subscription before this one runs out to keep your benefits active.</string>

17
Habitica/res/values/styles.xml
View file

@ -590,6 +590,23 @@
<item name="android:layout_marginEnd">16dp</item>
</style>
<style name="subscriptionBoxCompactText">
<item name="android:fontFamily">sans-serif-black</item>
<item name="android:textSize">14sp</item>
</style>
<style name="subscriptionBoxCompactTitle">
<item name="android:textColor">@color/text_primary</item>
<item name="android:fontFamily">sans-serif-black</item>
<item name="android:textSize">24sp</item>
</style>
<style name="subscriptionBoxCompactNumber">
<item name="android:textColor">@color/text_primary</item>
<item name="android:fontFamily">sans-serif-black</item>
<item name="android:textSize">20sp</item>
</style>
<style name="HabiticaButton.Purple" parent="HabiticaButton">
<item name="android:backgroundTint">@color/color_accent</item>
<item name="android:textColor">@color/white</item>

15
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
View file

@ -67,14 +67,14 @@ class SubscriptionDetailsView : LinearLayout {
}
if ((plan.extraMonths ?: 0) > 0) {
binding.subscriptionCreditWrapper.visibility = View.VISIBLE
binding.subscriptionCreditCard.visibility = View.VISIBLE
if (plan.extraMonths == 1) {
binding.subscriptionCreditTextView.text = resources.getString(R.string.one_month)
binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, 1)
} else {
binding.subscriptionCreditTextView.text = resources.getString(R.string.x_months, plan.extraMonths)
binding.subscriptionCreditTextView.text = resources.getString(R.string.subscription_credit_canceling, plan.extraMonths)
}
} else {
binding.subscriptionCreditWrapper.visibility = View.GONE
binding.subscriptionCreditCard.visibility = View.GONE
}
when (plan.paymentMethod) {
@ -93,11 +93,8 @@ class SubscriptionDetailsView : LinearLayout {
}
}
if (plan.consecutive?.count == 1) {
binding.monthsSubscribedTextView.text = resources.getString(R.string.one_month)
} else {
binding.monthsSubscribedTextView.text = resources.getString(R.string.x_months, plan.consecutive?.count ?: 0)
}
binding.monthsSubscribedTextView.text = plan.consecutive?.count.toString()
binding.gemCapTextView.text = plan.totalNumberOfGems.toString()