Code cleanup

HabitRPG · Sep 15, 2023 · 06cbc66 · 06cbc66
1 parent 6583b14
commit 06cbc66
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 401 deletions.
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
@@ -18,17 +18,19 @@
         android:background="?colorPrimaryOffset"
         android:baselineAligned="false">
 
-        <com.habitrpg.android.habitica.ui.views.RoundedCornerLayout
+        <FrameLayout
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:background="@drawable/rounded_avatar_bg">
+            android:background="@drawable/rounded_avatar_bg"
+            android:clipToPadding="true"
+            android:clipChildren="true">
             <com.habitrpg.common.habitica.views.AvatarView
                 android:id="@+id/avatarView"
                 android:layout_width="70dp"
                 android:layout_height="70dp"
                 android:layout_gravity="center"/>
-        </com.habitrpg.android.habitica.ui.views.RoundedCornerLayout>
+        </FrameLayout>
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -156,12 +158,6 @@
                 tools:visibility="visible" />
         </RelativeLayout>
     </LinearLayout>
-    <com.habitrpg.android.habitica.ui.views.social.QuestMenuView
-        android:id="@+id/questMenuView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        tools:visibility="visible"/>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"

diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
diff --git a/Habitica/res/layout/subscription_benefits.xml b/Habitica/res/layout/subscription_benefits.xml
@@ -6,6 +6,7 @@
     tools:parentTag="android.widget.LinearLayout"
     android:orientation="vertical">
     <LinearLayout
+        android:id="@+id/benefit_gems_for_gold_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
@@ -1463,6 +1463,7 @@
     <string name="subscription_benefit_armoire_sub">Your subscription gives you an extra chance at the Armoire!</string>
     <string name="subscriber_benefit_success_faint">You got a second chance with 1HP!</string>
     <string name="revive_broken_equipment">Your %s broke</string>
+    <string name="subscribe_gems_for_gold_incentive_text">Subscribe to buy Gems with Gold and receive these other exclusive benefits!</string>
 
 
     <plurals name="you_x_others">

diff --git a/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -268,7 +268,6 @@ class NavigationDrawerFragment : DialogFragment() {
         setDisplayName(user.profile?.name)
         setUsername(user.formattedUsername)
         binding?.avatarView?.setAvatar(user)
-        binding?.questMenuView?.configure(user)
 
         val userItems = user.items
         var hasSpecialItems = false

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AvatarCircleShape.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AvatarCircleShape.kt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/RoundedCornerLayout.kt
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentItemRow.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/equipment/EquipmentItemRow.kt