promo layout fixes

Habitica/res/layout/promo_menu.xml

@@ -41,6 +41,7 @@
             android:lineSpacingExtra="4dp"
             android:letterSpacing="0.015"
             android:textAlignment="center"
+            android:gravity="center"
             android:maxWidth="240dp"/>
         <Button
             android:id="@+id/button"
@@ -72,4 +73,4 @@
         android:layout_alignParentEnd="true"
         android:visibility="gone"
         style="@style/HabiticaButton.Borderless" />
-</merge>
+</merge>

Habitica/res/values-pt-rBR/strings.xml

@@ -1417,6 +1417,3 @@
     <string name="shop_armoire_description">Novos equipamentos são lançados durante as Galas sazonais. Até lá, há %d peças de equipamento do Armário Encantado para encontrar!</string>
     <string name="shop_armoire_empty_description">Novos equipamentos são lançados durante as Galas sazonais. O Armário Encantado recebe novos estoques todo mês também!</string>
 </resources>
-=======
-</resources>
->>>>>>> 7c1a682deddcd7a91fc9767586a61890c43396c4

Habitica/res/values/strings.xml

@@ -569,7 +569,8 @@
     <string name="reset_account">Reset Account</string>
     <string name="reset_account_title">Are you sure you want to reset?</string>
     <string name="confirm_reset">Confirm reset</string>
-    <string name="reset_account_description">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type RESET below.</string>
+    <string name="reset_account_description_new">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type your password below.</string>
+    <string name="reset_account_description_no_pw">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type RESET below.</string>
     <string name="delete_caps" translatable="false">DELETE</string>
     <string name="delete_account">Delete Account</string>
     <string name="delete_account_description">This will delete your account forever and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type your password into the text box below.</string>

Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/GiftOneGetOneHabiticaPromotion.kt

@@ -187,7 +187,7 @@ class GiftOneGetOneHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
             limitationsFormatter.format(startDate),
             utcTimeFormatter.format(startDate),
             limitationsFormatter.format(endDate),
-            utcTimeFormatter.format(startDate)
+            utcTimeFormatter.format(endDate)
         )
     }
 }

Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt

@@ -134,7 +134,7 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
                 val promoView = PromoMenuView(parent.context)
                 promoView.layoutParams = ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    148.dpToPx(parent.context)
+                    118.dpToPx(parent.context)
                 )
                 PromoMenuViewHolder(promoView)
             }

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

@@ -538,7 +538,7 @@ class NavigationDrawerFragment : DialogFragment() {
         val promoItem = HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_PROMO)
         promoItem.itemViewType = 5
         promoItem.isVisible = false
-        items.add(promoItem)
+        items.add(0, promoItem)
 
         if (configManager.showSubscriptionBanner()) {
             val item =