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

minor fixes

Browse source
This commit is contained in:
Phillip Thelen 2022-05-23 16:17:19 +02:00
parent 52a5f0baf4
commit afe8b22cca
12 changed files with 35 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -231,7 +231,7 @@
</activity>
<activity
android:name=".ui.activities.ReportMessageActivity"
android:theme="@style/BottomSheetTheme"
android:theme="@style/SheetDialog"
android:windowSoftInputMode="stateHidden|adjustResize">
</activity>
<service

2
Habitica/build.gradle
View file

@ -167,7 +167,7 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
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 3508
versionCode 3509
versionName "3.6"
targetSdkVersion 32

6
Habitica/res/drawable/button_background.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="24dp" />
<solid android:color="@color/white" />
<stroke android:color="@color/gray_500" android:width="2dp" />
</shape>

2
Habitica/res/drawable/button_background_gray_700.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/window_background" />
<corners android:radius="8dp"/>
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

2
Habitica/res/drawable/button_background_primary.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorAccent" />
<corners android:radius="8dp"/>
<corners android:radius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<stroke android:width="1dp" android:color="#19000000" />
</shape>

8
Habitica/res/drawable/purchase_button_background.xml
View file

@ -8,7 +8,7 @@
android:color="@color/brand_700" >
</solid>
<corners
android:radius="8dp">
android:radius="@dimen/rounded_button_radius">
</corners>
</shape>
</item>
@ -19,7 +19,7 @@
android:color="@color/brand_500">
</solid>
<corners
android:radius="8dp">
android:radius="@dimen/rounded_button_radius">
</corners>
</shape>
</item>
@ -29,7 +29,7 @@
android:color="@color/gray_600">
</solid>
<corners
android:radius="8dp">
android:radius="@dimen/rounded_button_radius">
</corners>
</shape>
</item>
@ -39,7 +39,7 @@
android:color="@color/white">
</solid>
<corners
android:radius="8dp">
android:radius="@dimen/rounded_button_radius">
</corners>
</shape>
</item>

11
Habitica/res/layout/edit_tag_item.xml
View file

@ -1,25 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical">
<ImageButton
android:id="@+id/delete_button"
android:layout_width="45dp"
android:layout_height="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="0dp"
android:src="@drawable/ic_close_purple_300_36dp"
android:tint="@color/color_accent"
android:src="@drawable/ic_close_white_24dp"
app:tint="@color/color_accent"
android:background="@color/transparent"/>
<EditText
android:id="@+id/edit_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:drawableEnd="@drawable/ic_create_grey_400_18dp"
tools:text="hello"
style="@style/TagEditTextTheme"
android:paddingBottom="14dp"

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

@ -269,23 +269,12 @@
</style>
<style name="MyWidgetTheme">
<item name="widgetBackgroundRadius">@dimen/my_background_radius_dimen</item>
<item name="widgetBackgroundRadius">12dp</item>
<item name="android:textColorPrimary">@color/text_primary</item>
<item name="android:textColorSecondary">@color/text_secondary</item>
<item name="android:colorBackground">@color/widget_background</item>
</style>
<style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowIsTranslucent">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="actionBarStyle">@color/transparent</item>
<item name="colorPrimary">@color/brand</item>
<item name="colorPrimaryDark">@color/brand_50</item>
<item name="colorAccent">@color/brand_400</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<style name="LaunchAppTheme" parent="AppTheme">
<item name="android:windowBackground">@drawable/activity_launch_background</item>
</style>
@ -892,12 +881,10 @@
<!--<item name="android:windowCloseOnTouchOutside">false</item>-->
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:colorBackground">@color/content_background</item>
<item name="android:backgroundDimEnabled">true</item>
<item name="android:backgroundDimAmount">0.3</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>
<item name="bottomSheetStyle">@style/Widget.App.BottomSheet.Modal</item>
<item name="colorPrimary">@color/brand</item>
@ -909,19 +896,11 @@
</style>
<style name="Widget.App.BottomSheet.Modal" parent="Widget.MaterialComponents.BottomSheet.Modal">
<item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>
<item name="android:backgroundTint">@color/window_background</item>
<item name="android:background">@drawable/bottom_sheet_background</item>
<item name="shapeAppearanceOverlay">@null</item>
<item name="shapeAppearance">@null</item>
<item name="android:layout_marginStart">4dp</item>
<item name="android:layout_marginEnd">4dp</item>
</style>
<style name="CustomShapeAppearanceBottomSheetDialog" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">20dp</item>
<item name="cornerSizeTopLeft">20dp</item>
<item name="cornerSizeBottomRight">0dp</item>
<item name="cornerSizeBottomLeft">0dp</item>
</style>
<dimen name="my_background_radius_dimen">12dp</dimen>
</resources>

3
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskType.kt
View file

@ -4,8 +4,7 @@ enum class TaskType constructor(val value: String) {
HABIT("habit"),
DAILY("daily"),
TODO("todo"),
REWARD("reward"),
ADD_ITEM("ADD_ITEM");
REWARD("reward");
override fun toString(): String = value

9
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -41,12 +41,12 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
import io.reactivex.rxjava3.core.Flowable
import java.util.UUID
import javax.inject.Inject
import javax.inject.Named
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import java.util.UUID
import javax.inject.Inject
import javax.inject.Named
class ChallengeFormActivity : BaseActivity() {
@ -565,8 +565,7 @@ class ChallengeFormActivity : BaseActivity() {
private fun createTask(taskName: String): Task {
val t = Task()
t.id = UUID.randomUUID().toString()
t.type = TaskType.ADD_ITEM
t.id = "addtask"
t.text = taskName
return t

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
View file

@ -50,7 +50,7 @@ class ChallengeTasksRecyclerViewAdapter(
TaskType.DAILY -> TYPE_DAILY
TaskType.TODO -> TYPE_TODO
TaskType.REWARD -> TYPE_REWARD
else -> if (addItemSubject.hasObservers() && task?.type == TaskType.ADD_ITEM) TYPE_ADD_ITEM else TYPE_HEADER
else -> if (addItemSubject.hasObservers() && task?.id == "addtask") TYPE_ADD_ITEM else TYPE_HEADER
}
}

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
View file

@ -17,6 +17,7 @@ import androidx.annotation.IdRes
import androidx.appcompat.widget.AppCompatCheckBox
import androidx.core.content.ContextCompat
import androidx.core.widget.CompoundButtonCompat
import androidx.core.widget.TextViewCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.TagRepository
@ -161,9 +162,11 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
button.setOnClickListener { createTag() }
button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null)
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
button.compoundDrawableTintList = ColorStateList.valueOf(context.getThemeColor(R.attr.colorPrimary))
TextViewCompat.setCompoundDrawableTintList(button, ColorStateList.valueOf(context.getThemeColor(R.attr.colorAccent)))
}
button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray)
button.elevation = 0f
button.setBackgroundResource(R.drawable.button_background_gray_700)
button.setShadowLayer(0f, 0f, 0f, ContextCompat.getColor(context, R.color.content_background))
button.setTextColor(ContextCompat.getColor(context, R.color.text_secondary))
binding.tagsList.addView(button)
}