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

fix incorrect description

Browse source
This commit is contained in:
Phillip Thelen 2020-01-06 17:37:58 +01:00
parent 34958d522b
commit c7d61c18e4
9 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -151,7 +151,7 @@ android {
multiDexEnabled true
resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
versionCode 2324
versionCode 2330
versionName "2.4"
}

18
Habitica/res/layout/activity_gift1get1_info.xml
View file

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/gray_700">
android:background="@color/white">
<LinearLayout
android:orientation="vertical"
@ -76,13 +76,15 @@
android:layout_height="wrap_content"
android:src="@drawable/g1g1_promo_left"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true" />
android:layout_alignParentStart="true"
android:layout_marginStart="-5dp"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/g1g1_promo_right"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" />
android:layout_alignParentEnd="true"
android:layout_marginEnd="-5dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
@ -98,6 +100,8 @@
android:textSize="15sp"
android:gravity="center"
android:lineHeight="20sp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:text="@string/g1g1_info_1"/>
<Button
android:id="@+id/gift_button"
@ -122,7 +126,9 @@
android:gravity="center"
android:textColor="@color/gray_300"
android:lineSpacingExtra="1dp"
android:layout_marginBottom="22dp"/>
android:layout_marginBottom="22dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -137,7 +143,9 @@
android:text="@string/g1g1_info_3_text"
android:gravity="center"
android:textColor="@color/gray_300"
android:lineSpacingExtra="1dp"/>
android:lineSpacingExtra="1dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

2
Habitica/res/layout/promo_gift_one_get_one.xml
View file

@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:minWidth="110dp"
android:text="@string/send_gift"
android:text="@string/learn_more"
style="@style/HabiticaButton.White"
android:textSize="14sp"
android:textColor="@color/teal_50"

5
Habitica/res/navigation/navigation.xml
View file

@ -150,6 +150,11 @@
app:argType="boolean"
android:defaultValue="true" />
</activity>
<activity
android:id="@+id/giftOneGetOneInfoActivity"
android:name="com.habitrpg.android.habitica.ui.activities.GiftOneGetOneInfoActivity"
android:label="@string/gift_one_get_one" >
</activity>
<activity
android:id="@+id/gemPurchaseActivity"
android:name="com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity"

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

@ -397,7 +397,7 @@
<string name="subscribe_listitem3_description">Subscribe now to get an exclusive set now and receive new items every month!</string>
<string name="subscribe_listitem3_description_new">Subscribe now to get this %s and receive new items every month! </string>
<string name="subscribe_listitem4_description">Receive the Royal Purple Jackalope pet when you become a new subscriber.</string>
<string name="subscribe_listitem5_description">Discover even more items in Habitica with a 2x bonus daily drop rate.</string>
<string name="subscribe_listitem5_description">Discover even more items in Habitica with a 2x bonus daily drop cap.</string>
<string name="subscribe1month_gemcap">25 Gem cap</string>
<string name="subscribe3month_gemcap">30 Gem cap</string>
<string name="subscribe6month_gemcap">35 Gem cap</string>
@ -922,7 +922,8 @@
<string name="g1g1_info_2">How it works</string>
<string name="g1g1_info_2_text">Tap ‘Gift a Subscription’ and type in the username of the account you’d like to gift to. From there, pick the sub length you’d like to gift and check out. Your account will automatically be rewarded with the same level of subscription you just gifted.</string>
<string name="g1g1_info_3">Limitations</string>
<string name="g1g1_info_3_text">This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is cancelled expires.</string>
<string name="g1g1_info_3_text">This promotion only applies when you gift to another Habitican. If you or your gift recipient already have a subscription, the gifted subscription will add months of credit that will only be used after the current subscription is cancelled or expires.</string>
<string name="limited_event">Limited event</string>
<string name="g1g1_duration">Dec 17 to Jan 6</string>
<string name="learn_more">Learn more</string>
</resources>

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
View file

@ -315,7 +315,7 @@ class RealmInventoryLocalRepository(realm: Realm, private val context: Context)
override fun getLatestMysteryItem(): Flowable<Equipment> {
return realm.where(Equipment::class.java)
.beginsWith("key", "armor_mystery_2")
.contains("key", "mystery_2")
.sort("key", Sort.DESCENDING)
.findAll()
.asFlowable()

5
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
View file

@ -23,6 +23,7 @@ class NotificationOpenHandler {
PushNotificationManager.GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY -> openSubscriptionScreen()
PushNotificationManager.CHAT_MENTION_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
PushNotificationManager.GROUP_ACTIVITY_NOTIFICATION_KEY -> handleChatMessage(intent.getStringExtra("type"), intent.getStringExtra("groupID"))
PushNotificationManager.G1G1_PROMO_KEY -> openGiftOneGetOneInfoScreen()
}
}
@ -42,6 +43,10 @@ class NotificationOpenHandler {
MainNavigationController.navigate(R.id.partyFragment)
}
private fun openGiftOneGetOneInfoScreen() {
MainNavigationController.navigate(R.id.giftOneGetOneInfoActivity)
}
private fun openQuestDetailSCreen(partyId: String?, questKey: String?) {
if (partyId == null || questKey == null ||partyId.isNotEmpty() || questKey.isNotEmpty()) {
return

1
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
View file

@ -115,6 +115,7 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
const val GIFT_ONE_GET_ONE_PUSH_NOTIFICATION_KEY = "gift1get1"
const val CHAT_MENTION_NOTIFICATION_KEY = "chatMention"
const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
const val G1G1_PROMO_KEY = "g1g1Promo"
private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
View file

@ -43,8 +43,6 @@ class InsufficientGemsDialog(context: Context) : InsufficientCurrencyDialog(cont
super.onCreate(savedInstanceState)
imageView.setImageResource(R.drawable.gems_84)
textView.setText(R.string.insufficientGems)
addCloseButton()
}