mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-04-14 19:56:32 +00:00
fix potential crashes
This commit is contained in:
parent
27f3e5645b
commit
7e9c70fae8
11 changed files with 27 additions and 10 deletions
|
|
@ -2,8 +2,8 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="com.habitrpg.android.habitica"
|
||||
android:versionCode="155"
|
||||
android:versionName="0.0.37"
|
||||
android:versionCode="156"
|
||||
android:versionName="0.0.37.1"
|
||||
android:screenOrientation="portrait"
|
||||
android:installLocation="auto" >
|
||||
|
||||
|
|
|
|||
BIN
Habitica/res/drawable-hdpi/ic_check_purple_24dp.png
Normal file
BIN
Habitica/res/drawable-hdpi/ic_check_purple_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 252 B |
BIN
Habitica/res/drawable-mdpi/ic_check_purple_24dp.png
Normal file
BIN
Habitica/res/drawable-mdpi/ic_check_purple_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 180 B |
BIN
Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png
Normal file
BIN
Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 301 B |
BIN
Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png
Normal file
BIN
Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 428 B |
BIN
Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png
Normal file
BIN
Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 521 B |
|
|
@ -293,11 +293,11 @@
|
|||
android:textStyle="bold" />
|
||||
|
||||
<com.facebook.drawee.view.SimpleDraweeView
|
||||
android:id="@+id/attributes_collapse_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
|
||||
android:layout_gravity="bottom" />
|
||||
android:id="@+id/attributes_collapse_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp"
|
||||
android:layout_gravity="bottom" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
13
Habitica/res/values-v21/styles.xml
Normal file
13
Habitica/res/values-v21/styles.xml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="GemPurchaseListItem">
|
||||
<item name="android:textColor">@color/brand_100</item>
|
||||
<item name="android:gravity">center_horizontal</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:drawableLeft">@drawable/ic_check_purple</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:drawablePadding">4dp</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
<item name="android:textColor">@color/brand_100</item>
|
||||
<item name="android:gravity">center_horizontal</item>
|
||||
<item name="android:textSize">12sp</item>
|
||||
<item name="android:drawableLeft">@drawable/ic_check_purple</item>
|
||||
<item name="android:drawableLeft">@drawable/ic_check_purple_24dp</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:drawablePadding">4dp</item>
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -108,7 +108,11 @@ public class PopupNotificationsManager {
|
|||
}
|
||||
|
||||
public Boolean showNotificationDialog(final List<Notification> notifications) {
|
||||
if (notifications.size() == 0) {
|
||||
if (notifications == null || notifications.size() == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
|
|||
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
if (position == 1 && GuildFragment.this.guild != null) {
|
||||
if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) {
|
||||
chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue