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

Fix style issues

Browse source
This commit is contained in:
Phillip Thelen 2020-09-17 17:58:59 +02:00
parent 259b8970b0
commit e1221c1f53
14 changed files with 32 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -158,7 +158,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 2551
versionCode 2552
versionName "3.0"
}

4
Habitica/res/layout/activity_gift_gems.xml
View file

@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:background="?headerOffsetColor"
android:elevation="0dp"
android:fillViewport="false"
@ -41,7 +41,7 @@
app:layout_collapseMode="pin"
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabIndicatorColor="?colorPrimary"
app:tabMode="fixed" />
<androidx.viewpager.widget.ViewPager

1
Habitica/res/layout/activity_main.xml
View file

@ -99,7 +99,6 @@
android:fillViewport="false"
app:layout_anchor="@+id/collapsing_toolbar"
app:layout_anchorGravity="bottom"
app:layout_collapseMode="pin"
app:tabGravity="fill"
app:tabIndicatorColor="?colorPrimary"

6
Habitica/res/layout/activity_skill_tasks.xml
View file

@ -28,17 +28,15 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:background="?headerOffsetColor"
android:elevation="0dp"
android:fillViewport="false"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:layout_anchor="@+id/collapsing_toolbar"
app:layout_anchorGravity="bottom"
app:layout_collapseMode="pin"
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabIndicatorColor="?colorPrimary"
app:tabMode="fixed" />
<androidx.viewpager.widget.ViewPager

6
Habitica/res/layout/activity_task_form.xml
View file

@ -47,7 +47,8 @@
android:layout_height="wrap_content"
style="@style/TaskFormTextInputLayoutAppearance"
app:boxStrokeColor="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
app:hintTextColor="?colorPrimaryText"
android:backgroundTint="?attr/colorPrimaryText"
android:alpha="0.75">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/text_edit_text"
@ -63,7 +64,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:boxStrokeColor="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimary"
android:backgroundTint="?attr/colorPrimaryText"
app:hintTextColor="?colorPrimaryText"
android:layout_marginTop="@dimen/spacing_large"
android:alpha="0.75">
<androidx.appcompat.widget.AppCompatEditText

7
Habitica/res/layout/dialog_habitica_primary_button.xml
View file

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="60dp"
style="@style/HabiticaButton.Primary">
style="@style/HabiticaButton.Primary"
tools:text="Test">
</Button>

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

@ -83,7 +83,7 @@
android:gravity="center"
android:minWidth="20dp"
android:paddingTop="0dp"
android:textColor="#FFF"
android:textColor="@color/text_inverted"
android:textSize="12sp"
android:visibility="gone"
tools:text="1"

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

@ -394,7 +394,7 @@
<string name="empty_title_todos">You don&amp;rsquo;t have any To-Dos</string>
<string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
<string name="empty_title_rewards">You don&amp;rsquo;t have any Rewards</string>
<string name="reset_walkthrough">Reset Justin&amp;rsquo;s Walkthrough</string>
<string name="reset_walkthrough">Reset Tutorials</string>
<string name="read_community_guidelines">Review our <u>Community Guidelines</u> before posting</string>
<string name="maintenance">Maintenance</string>
<string name="reload_content">Reload Content</string>

1
Habitica/res/values-night/colors.xml
View file

@ -6,6 +6,7 @@
<color name="text_ternary">@color/gray_400</color>
<color name="text_quad">@color/gray_300</color>
<color name="text_dimmed">@color/gray_200</color>
<color name="text_inverted">@color/gray_10</color>
<color name="text_brand">@color/brand_400</color>
<color name="text_brand_neon">@color/brand_500</color>
<color name="text_red">@color/red_10</color>

1
Habitica/res/values/colors.xml
View file

@ -160,6 +160,7 @@
<color name="text_ternary">@color/gray_200</color>
<color name="text_quad">@color/gray_300</color>
<color name="text_dimmed">@color/gray_400</color>
<color name="text_inverted">@color/gray_700</color>
<color name="text_brand">@color/brand_300</color>
<color name="text_brand_neon">@color/brand_400</color>
<color name="text_red">@color/red_10</color>

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

@ -64,7 +64,7 @@
<item name="colorPrimary">@color/gray_500</item>
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="textColorPrimaryDark">@color/gray_400</item>
<item name="textColorPrimaryDark">@color/brand_500</item>
</style>
<style name="MainAppTheme.Red">
@ -641,7 +641,7 @@
<style name="HabiticaButton.Primary" parent="HabiticaButton">
<item name="android:backgroundTint">@color/color_accent</item>
<item name="android:textColor">?textColorPrimaryDark</item>
<item name="android:textColor">@color/white</item>
</style>
<style name="HabiticaButton.Small" parent="HabiticaButton">
@ -720,16 +720,19 @@
<!-- reference our hint & error styles -->
<item name="boxBackgroundColor">@color/white</item>
<item name="android:textColor">?attr/colorPrimaryText</item>
<item name="android:textColorHint">@color/textColorLight</item>
<item name="android:textColorHint">?colorPrimaryText</item>
<item name="colorControlNormal">?attr/colorPrimary</item>
<item name="colorControlActivated">?attr/colorPrimary</item>
<item name="colorControlHighlight">?attr/colorPrimary</item>
<item name="colorAccent">?attr/colorPrimary</item>
<item name="colorAccent">?attr/colorPrimaryText</item>
<item name="colorPrimary">?attr/colorPrimaryText</item>
<item name="hintTextAppearance">@style/TaskFormHintTextAppearance</item>
</style>
<style name="TaskFormHintTextAppearance">
<item name="android:colorPrimary">?attr/colorPrimaryText</item>
<item name="colorPrimary">?attr/colorPrimaryText</item>
<item name="textColorPrimary">?attr/colorPrimaryText</item>
<item name="android:textSize">12sp</item>
<item name="android:fontFamily">@string/font_family_medium</item>
<item name="fontFamily">@string/font_family_medium</item>
@ -742,7 +745,7 @@
<item name="android:colorControlNormal">?attr/colorPrimary</item>
<item name="android:colorControlActivated">?attr/colorPrimary</item>
<item name="android:colorControlHighlight">?attr/colorPrimary</item>
<item name="android:colorAccent">@color/brand_400</item>
<item name="android:colorAccent">?colorPrimaryText</item>
</style>
<style name="TextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">

1
Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.kt
View file

@ -2,6 +2,5 @@ package com.habitrpg.android.habitica.models
class Transaction {
var receipt: String? = null
var signature: String? = null
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/HabitScoringButtonsView.kt
View file

@ -66,6 +66,10 @@ class HabitScoringButtonsView @JvmOverloads constructor(
isNegative = !isNegative
sendAccessibilityEvent(AccessibilityEvent.CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION)
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
isPositive = true
isNegative = true

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskDifficultyButtons.kt
View file

@ -31,7 +31,8 @@ class TaskDifficultyButtons @JvmOverloads constructor(
}
private lateinit var selectedButton: View
init {
override fun onAttachedToWindow() {
super.onAttachedToWindow()
addAllButtons()
}