sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 20:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spacing and icon tweaks

Browse source
This commit is contained in:
Phillip Thelen 2016-08-11 18:06:55 +02:00
parent 609a037307
commit d89609d562
21 changed files with 72 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="113"
android:versionCode="114"
android:versionName="0.0.33.1"
android:screenOrientation="portrait"
android:installLocation="auto" >

BIN
Habitica/res/drawable-hdpi/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 93 B

BIN
Habitica/res/drawable-hdpi/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 179 B

BIN
Habitica/res/drawable-mdpi/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 90 B

BIN
Habitica/res/drawable-mdpi/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 126 B

BIN
Habitica/res/drawable-xhdpi/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 93 B

BIN
Habitica/res/drawable-xhdpi/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 158 B

BIN
Habitica/res/drawable-xxhdpi/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 102 B

BIN
Habitica/res/drawable-xxhdpi/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 243 B

BIN
Habitica/res/drawable-xxxhdpi/minus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 109 B

BIN
Habitica/res/drawable-xxxhdpi/plus.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 308 B

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

@ -63,9 +63,9 @@
<android.support.design.widget.TabLayout
android:id="@+id/detail_tabs"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="54dp"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
android:background="@color/brand_200"
android:elevation="0dp"
android:fillViewport="false"

22
Habitica/res/layout/avatar_with_bars.xml
View file

@ -24,8 +24,8 @@
android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height"
android:layout_gravity="center_vertical"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp"
app:showBackground="true"
app:showMount="true"
app:showPet="true" />
@ -38,21 +38,31 @@
<include
android:id="@+id/hpBar"
layout="@layout/value_bar" />
layout="@layout/value_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing" />
<include
android:id="@+id/xpBar"
layout="@layout/value_bar" />
layout="@layout/value_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/header_bar_spacing" />
<include
android:id="@+id/mpBar"
layout="@layout/value_bar" />
layout="@layout/value_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp">
<TextView
android:id="@+id/lvl_tv"
android:layout_width="wrap_content"

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

@ -26,9 +26,10 @@
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingLeft="@dimen/task_text_padding"
android:paddingStart="@dimen/task_text_padding"
android:paddingRight="@dimen/task_text_padding"
android:paddingEnd="@dimen/task_text_padding"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding"
android:id="@+id/linearLayout"
@ -74,7 +75,7 @@
</LinearLayout>
<View
android:id="@+id/rightBorderView"
android:layout_width="5dp"
android:layout_width="@dimen/task_right_border_width"
android:layout_height="match_parent"
android:gravity="center" />
</LinearLayout>

25
Habitica/res/layout/habit_item_card.xml
View file

@ -21,11 +21,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/btnPlusBackground"/>
<ImageView
android:id="@+id/btnPlusIconView"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/plus"
android:scaleType="center"
android:layout_gravity="center" />
<Button
android:id="@+id/btnPlus"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="+"
android:background="@drawable/selection_highlight"
style="@style/HabitButton" />
</FrameLayout>
@ -38,11 +44,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/btnMinusBackground"/>
<ImageView
android:id="@+id/btnMinusIconView"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/minus"
android:scaleType="center"
android:layout_gravity="center" />
<Button
android:id="@+id/btnMinus"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="-"
android:background="@drawable/selection_highlight"
style="@style/HabitButton"/>
</FrameLayout>
@ -52,9 +64,10 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingLeft="@dimen/task_text_padding"
android:paddingStart="@dimen/task_text_padding"
android:paddingRight="@dimen/task_text_padding"
android:paddingEnd="@dimen/task_text_padding"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding">
<net.pherth.android.emoji_library.EmojiTextView
@ -72,7 +85,7 @@
</LinearLayout>
<View
android:id="@+id/rightBorderView"
android:layout_width="5dp"
android:layout_width="@dimen/task_right_border_width"
android:layout_height="match_parent"
android:gravity="center" />
</LinearLayout>

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

@ -20,7 +20,9 @@
android:layout_weight="1"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding"
android:paddingLeft='16dp'
android:paddingLeft="@dimen/task_text_padding"
android:paddingStart="@dimen/task_text_padding"
android:paddingEnd="@dimen/reward_spacing"
android:paddingRight="@dimen/reward_spacing"
android:layout_gravity="center_vertical">

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

@ -27,9 +27,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:paddingLeft="@dimen/task_text_padding"
android:paddingStart="@dimen/task_text_padding"
android:paddingRight="@dimen/task_text_padding"
android:paddingEnd="@dimen/task_text_padding"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding"
android:layout_weight="1">

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

@ -41,8 +41,8 @@
android:id="@+id/ic_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/bar_padding"
android:layout_marginEnd="@dimen/bar_padding"
android:layout_marginRight="@dimen/bar_icon_padding"
android:layout_marginEnd="@dimen/bar_icon_padding"
android:layout_alignTop="@+id/bar_full"
android:layout_alignBottom="@id/bar_full"
android:scaleType="center"
@ -74,7 +74,8 @@
android:layout_below="@id/bar_full"
android:layout_toRightOf="@id/ic_header"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="1dp">
<TextView
android:id="@+id/TV_value"
android:layout_width="0dp"

9
Habitica/res/values/dimens.xml
View file

@ -31,7 +31,7 @@
<dimen name="btn_separator_margin">4dip</dimen>
<dimen name="list_preferred_item_height">48dp</dimen>
<dimen name="minus_plus_buttonsize">50dp</dimen>
<dimen name="minus_plus_buttonsize">65dp</dimen>
<dimen name="view_layout_margin">4dp</dimen>
<dimen name="row_size">58dp</dimen>
<dimen name="btn_height_reward">50dp</dimen>
@ -42,7 +42,7 @@
<!-- Widget -->
<dimen name="widget_bar_horizontal_margin">20dp</dimen>
<dimen name="button_width">60dp</dimen>
<dimen name="button_width">65dp</dimen>
<dimen name="hairline_height">0.5dp</dimen>
<dimen name="checklist_divider_width">14dp</dimen>
@ -72,4 +72,9 @@
<dimen name="pet_image_height">99dp</dimen>
<dimen name="shop_width">162dp</dimen>
<dimen name="shop_height">138dp</dimen>
<dimen name="bar_icon_padding">10dp</dimen>
<dimen name="task_text_padding">16dp</dimen>
<dimen name="task_right_border_width">5dp</dimen>
<dimen name="header_bar_spacing">7dp</dimen>
<dimen name="habit_circle_background_size">40dp</dimen>
</resources>

7
Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
View file

@ -297,8 +297,13 @@ public class APIHelper implements Action1<Throwable> {
} else if (throwableClass.equals(HttpException.class)) {
HttpException error = (HttpException) throwable;
ErrorResponse res = getErrorResponse(error);
int status = error.code();
if (error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
//workaround for an error that sometimes displays that the user already has this push device
return;
}
if (status >= 400 && status < 500) {
if (res != null && res.message != null && !res.message.isEmpty()) {
showConnectionProblemDialog("", res.message);

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
View file

@ -6,6 +6,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import org.greenrobot.eventbus.EventBus;
import android.graphics.Color;
import android.view.View;
import android.widget.Button;
import android.widget.FrameLayout;
@ -17,6 +18,8 @@ public class HabitViewHolder extends BaseTaskViewHolder {
@BindView(R.id.btnPlusWrapper)
FrameLayout btnPlusWrapper;
@BindView(R.id.btnPlusIconView)
View btnPlusIconView;
@BindView(R.id.btnPlusBackground)
View btnPlusBackground;
@BindView(R.id.btnPlus)
@ -24,6 +27,8 @@ public class HabitViewHolder extends BaseTaskViewHolder {
@BindView(R.id.btnMinusWrapper)
FrameLayout btnMinusWrapper;
@BindView(R.id.btnMinusIconView)
View btnMinusIconView;
@BindView(R.id.btnMinusBackground)
View btnMinusBackground;
@BindView(R.id.btnMinus)