Fix various minor issues

HabitRPG · Oct 6, 2020 · 1ac2c5a · 1ac2c5a
1 parent 1c44bad
commit 1ac2c5a
Show file tree

Hide file tree

Showing 52 changed files with 168 additions and 90 deletions.
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
@@ -12,6 +12,7 @@
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" tools:node="remove" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove" />
 
 
     <application
@@ -132,6 +133,7 @@
             android:name=".ui.activities.TaskFormActivity"
             android:parentActivityName=".ui.activities.MainActivity"
             tools:ignore="UnusedAttribute"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml
@@ -11,7 +11,6 @@
         android:minSdkVersion="15"
         android:targetSdkVersion="24" />
 
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
@@ -156,8 +156,8 @@ 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 2561
-        versionName "3.0"
+        versionCode 2571
+        versionName "3.0.1"
     }
 
     viewBinding {

diff --git a/Habitica/res/drawable/checklist_unchecked.xml b/Habitica/res/drawable/checklist_unchecked.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-    <solid android:color="@color/checkbox_fill" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
diff --git a/Habitica/res/drawable/round_checklist_unchecked.xml b/Habitica/res/drawable/round_checklist_unchecked.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/checkbox_fill" />
+    <solid android:color="@color/white" />
     <size android:height="20dp" android:width="20dp" />
 </shape>
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/Theme.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView

diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
@@ -37,7 +37,7 @@
                     android:minHeight="?attr/actionBarSize"
                     android:background="?attr/colorContentBackground"
                     app:layout_collapseMode="pin"
-                    app:popupTheme="@style/Theme.AppCompat.Light" />
+                    app:popupTheme="@style/PopupTheme" />
             </com.google.android.material.appbar.AppBarLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>

diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView

diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
@@ -234,6 +234,19 @@
                         android:textColor="@color/white_75_alpha"
                         android:background="@color/transparent" />
 
+                    <TextView
+                        android:id="@+id/privacy_policy"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_marginBottom="@dimen/spacing_xlarge"
+                        android:gravity="center_horizontal"
+                        android:layout_height="wrap_content"
+                        android:text="@string/login_disclaimer"
+                        android:linksClickable="true"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="@color/white_75_alpha"
+                        android:background="@color/transparent" />
+
                 </LinearLayout>
 
             </ScrollView>

diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            app:popupTheme="@style/PopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/Habitica/res/layout/activity_skill_tasks.xml b/Habitica/res/layout/activity_skill_tasks.xml
@@ -19,7 +19,7 @@
             android:minHeight="?attr/actionBarSize"
             android:theme="@style/Toolbar.Modern"
             app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+            app:popupTheme="@style/PopupTheme"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 

diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
@@ -74,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:text="@string/edit_tag_btn_edit"
-                    android:textColor="@color/text_brand"
+                    android:textColor="?colorPrimary"
                     android:textSize="16sp"
                     android:gravity="end|center_vertical"
                     android:paddingEnd="0dp"/>

diff --git a/Habitica/res/layout/edit_tag_item.xml b/Habitica/res/layout/edit_tag_item.xml
@@ -5,12 +5,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical">
-    <Button
+    <ImageButton
         android:id="@+id/delete_button"
         android:layout_width="45dp"
         android:layout_height="wrap_content"
         android:padding="0dp"
-        android:drawableStart="@drawable/ic_close_purple_300_36dp"
+        android:src="@drawable/ic_close_purple_300_36dp"
+        android:tint="?colorPrimary"
+        android:tintMode="src_atop"
         style="@style/Base.Widget.AppCompat.Button.Borderless"/>
     <EditText
         android:id="@+id/edit_text"

diff --git a/Habitica/res/layout/fragment_gift_gem_balance.xml b/Habitica/res/layout/fragment_gift_gem_balance.xml
@@ -55,8 +55,7 @@
                 android:id="@+id/gift_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:inputType="number"
-                android:paddingTop="@dimen/spacing_small"/>
+                android:inputType="number"/>
         </com.google.android.material.textfield.TextInputLayout>
         <TextView
             android:layout_width="match_parent"

diff --git a/Habitica/res/layout/fragment_gift_gem_purchase.xml b/Habitica/res/layout/fragment_gift_gem_purchase.xml
@@ -45,7 +45,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginHorizontal="@dimen/spacing_large">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -99,7 +100,8 @@
             android:gravity="center"
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:layout_marginBottom="@dimen/spacing_large"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:layout_marginBottom="@dimen/spacing_xlarge"
             style="@style/Caption2"/>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
@@ -324,7 +324,7 @@
                 <Button
                     android:text="@string/subscribe"
                     android:layout_width="match_parent"
-                    android:layout_height="36dp"
+                    android:layout_height="wrap_content"
                     android:id="@+id/subscribeButton"
                     style="@style/HabiticaButton.Purple.Small"
                     android:textAllCaps="false"

diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
@@ -37,9 +37,16 @@
                 android:id="@+id/more_button"
                 android:src="@drawable/ic_more_horiz_black_18dp"
                 android:background="@color/transparent"
+                android:tint="?textColorPrimary"
                 android:layout_width="30dp"
                 android:layout_height="20dp"
                 android:layout_gravity="end"/>
+            <TextView
+                android:id="@+id/you_pill"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Pill"
+                android:text="@string/you"/>
         </LinearLayout>
         <TableLayout
             android:layout_width="match_parent"

diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
@@ -217,7 +217,7 @@
         <Button
             android:id="@+id/change_subscription_button"
             android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="wrap_content"
             android:text="@string/visit_website"
             android:layout_gravity="center"
             style="@style/HabiticaButton.Purple"

diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:lineSpacingExtra="2sp"
-            android:textSize="14sp"
+            android:textSize="15sp"
             android:letterSpacing="0.025"
             tools:text="Habit Title" />
 
@@ -30,7 +30,7 @@
             android:textColor="@color/text_ternary"
             android:maxLines="3"
             android:ellipsize="end"
-            android:textSize="12sp"
+            android:textSize="13sp"
             tools:text="Notes"
             android:layout_marginBottom="7dp"/>
 

diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
@@ -11,10 +11,11 @@
         android:layout_height="1dp"
         android:background="@color/content_background_offset"/>
     <LinearLayout
-        android:id="@+id/title_view"
+        android:id="@+id/section_title_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="32dp"
         android:gravity="center_vertical">
         <TextView
             android:id="@+id/titleTextView"
@@ -41,7 +42,6 @@
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:scaleType="center"
-            android:paddingEnd="32dp" />
+            android:scaleType="center" />
     </LinearLayout>
 </merge>
diff --git a/Habitica/res/layout/view_invitation.xml b/Habitica/res/layout/view_invitation.xml
@@ -13,8 +13,7 @@
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/CardContent">
+            android:layout_height="match_parent">
 
             <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                 android:layout_width="@dimen/party_invite_avatar"
@@ -38,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/party_invite_separator"
-                android:text="@string/invitation_title" />
+                android:text="@string/invitation_title_no_leader" />
 
             <Space
                 android:layout_width="0dp"
@@ -52,19 +51,21 @@
                 android:layout_marginEnd="@dimen/party_invite_separator"
                 android:layout_gravity="end|center_vertical|fill_horizontal">
 
-                <Button
+                <ImageButton
                     android:id="@+id/accept_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_accept" />
+                    android:src="@drawable/party_invite_accept"
+                    android:background="@color/transparent" />
 
-                <Button
+                <ImageButton
                     android:id="@+id/reject_button"
-                    android:layout_width="@dimen/party_invite_button"
-                    android:layout_height="@dimen/party_invite_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/party_accept_button_start_margin"
-                    android:background="@drawable/party_invite_reject" />
+                    android:src="@drawable/party_invite_reject"
+                    android:background="@color/transparent" />
             </LinearLayout>
         </LinearLayout>
     </FrameLayout>

diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
@@ -830,7 +830,7 @@
     <string name="register_btn_google">Registrarse con Google</string>
     <string name="register_btn_fb">Registrarse con Facebook</string>
     <string name="login_btn_apple">Registrarse con Apple</string>
-    <string name="x_months">Meses</string>
+    <string name="x_months">%d Meses</string>
     <string name="inbox_messages_title_nosender">Recibiste %d mensajes</string>
     <string name="inbox_messages_title">Recibiste %d mensajes de %s</string>
     <string name="create_task">Crear %s</string>

diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
@@ -900,7 +900,7 @@
     <string name="renew_subscription">寄付を再開する</string>
     <string name="thanks_for_subscribing">寄付に感謝します</string>
     <string name="subscribe_options_title">あなたのご都合にあった寄付の期間を選びましょう</string>
-    <string name="ending_on">%@に止める</string>
+    <string name="ending_on">%sに止める</string>
     <string name="not_recurring">くり返さない</string>
     <string name="cancelled">キャンセルしました</string>
     <string name="send_invites">招待状を送る</string>

diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
@@ -13,7 +13,7 @@
     <dimen name="section_top_padding">16dp</dimen>
     <dimen name="card_margin">6dp</dimen>
 
-    <dimen name="party_invite_button">31dp</dimen>
+    <dimen name="party_invite_button">34dp</dimen>
     <dimen name="party_accept_button_start_margin">5dp</dimen>
     <dimen name="party_invite_avatar">46dp</dimen>  <!--50?-->
     <dimen name="party_invite_separator">4dp</dimen>

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
@@ -1110,4 +1110,7 @@
     <string name="user_is_blocked">You blocked this user</string>
     <string name="user_is_blocked_explanation">A blocked user cannot send you Private Messages but you will still see their posts in Tavern or Guilds.</string>
     <string name="finish">Finish</string>
+    <string name="login_disclaimer">By signing up, you are indicating that you have read and agree to the <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/privacy">Privacy Policy.</a></string>
+    <string name="you">You</string>
+    <string name="invitation_title_no_leader">You were invited to join a party</string>
 </resources>