sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix small crash

Browse source
This commit is contained in:
Phillip Thelen 2019-06-21 09:08:30 +02:00
parent 23484e1e09
commit 63c6e5e1fd
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/build.gradle
View file

@ -150,8 +150,8 @@ android {
buildConfigField "String", "TESTING_LEVEL", "\"production\""
multiDexEnabled true
versionCode 2165
versionName "1.10"
versionCode 2168
versionName "2.0"
}
lintOptions {

9
Habitica/res/layout/achievement_list_item.xml
View file

@ -34,18 +34,19 @@
android:layout_marginTop="0dp"/>
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginRight="@dimen/spacing_large">
<TextView
android:id="@+id/achievement_title"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Body1"
android:textColor="@color/gray_100"/>
<TextView
android:id="@+id/achievement_description"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Caption3"
android:textColor="@color/gray_100"/>

5
Habitica/res/layout/shop_header.xml
View file

@ -34,7 +34,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="124dp"
style="@style/Caption2"
android:layout_marginTop="120dp"
android:layout_marginBottom="4dp"
style="@style/Body1"
tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
</FrameLayout>

3
Habitica/res/values/styles.habitica.xml
View file

@ -67,6 +67,7 @@
<item name="android:fontFamily">@string/font_family_medium</item>
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.035</item>
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Body1_Button" parent="@style/Widget.AppCompat.Button.Borderless">
@ -122,7 +123,7 @@
<item name="android:letterSpacing">0.035</item>
</style>
<style name="Overline">
<item name="android:fontFamily">@string/font_family_regular</item>
<item name="android:fontFamily">@string/font_family_medium</item>
<item name="android:textSize">10sp</item>
<item name="android:letterSpacing">0.15</item>
<item name="android:textAllCaps">true</item>

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

@ -444,10 +444,11 @@ class TaskFormActivity : BaseActivity() {
val alert = HabiticaAlertDialog(this)
alert.setTitle(R.string.are_you_sure)
alert.addButton(R.string.delete_task, true) { _, _ ->
task?.id?.let { taskRepository.deleteTask(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
dismissKeyboard()
finish()
}
if (task?.isValid != true) return@addButton
task?.id?.let { taskRepository.deleteTask(it).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
dismissKeyboard()
finish()
}
alert.addCancelButton()
alert.show()
}