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

update fab icons

Browse source
This commit is contained in:
Phillip Thelen 2017-04-17 18:31:01 +02:00
parent 3f8f01b613
commit 5fa6aa45cc
20 changed files with 76 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Habitica/res/drawable-hdpi/add_daily.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 830 B

BIN
Habitica/res/drawable-hdpi/add_habit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 921 B

BIN
Habitica/res/drawable-hdpi/add_rewards.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Habitica/res/drawable-hdpi/add_todo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 869 B

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Habitica/res/drawable-mdpi/add_daily.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 512 B

After

Width:  |  Height:  |  Size: 603 B

BIN
Habitica/res/drawable-mdpi/add_habit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 561 B

After

Width:  |  Height:  |  Size: 687 B

BIN
Habitica/res/drawable-mdpi/add_rewards.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 793 B

BIN
Habitica/res/drawable-mdpi/add_todo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 776 B

BIN
Habitica/res/drawable-xhdpi/add_daily.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 901 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
Habitica/res/drawable-xhdpi/add_habit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
Habitica/res/drawable-xhdpi/add_rewards.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Habitica/res/drawable-xhdpi/add_todo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Habitica/res/drawable-xxhdpi/add_daily.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Habitica/res/drawable-xxhdpi/add_habit.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Habitica/res/drawable-xxhdpi/add_rewards.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Habitica/res/drawable-xxhdpi/add_todo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

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

@ -82,7 +82,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginBottom="-5dp"
/>
<com.roughike.bottombar.BottomBar
android:id="@+id/bottom_navigation"

140
Habitica/res/layout/floating_menu_tasks.xml
View file

@ -1,90 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab.menu"
app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab.menu"
app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="16dp"
android:layout_marginRight="8dp"
fab:menu_fab_size="normal"
fab:menu_colorNormal="@color/brand_400"
fab:menu_colorPressed="@color/brand_500"
fab:menu_colorRipple="#FFFFFF"
fab:menu_animationDelayPerItem="50"
fab:menu_icon="@drawable/fab_add"
fab:menu_buttonSpacing="2dp"
fab:menu_labels_margin="4dp">
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.habit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="16dp"
android:layout_marginRight="8dp"
fab:menu_fab_size="normal"
fab:menu_labels_paddingTop="8dp"
fab:menu_labels_paddingRight="8dp"
fab:menu_labels_paddingBottom="8dp"
fab:menu_labels_paddingLeft="8dp"
fab:menu_colorNormal="@color/brand_400"
fab:menu_colorPressed="@color/brand_500"
fab:menu_colorRipple="#FFFFFF"
fab:menu_animationDelayPerItem="50"
fab:menu_icon="@drawable/fab_add"
fab:menu_buttonSpacing="4dp">
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.habit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
android:src="@drawable/add_habit"
fab:fab_size="mini"
fab:fab_label="@string/new_habit" />
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.daily"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
android:src="@drawable/add_habit"
fab:fab_size="mini"
fab:fab_label="@string/new_habit" />
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.daily"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
android:src="@drawable/add_daily"
fab:fab_size="mini"
fab:fab_label="@string/new_daily" />
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.todo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/add_daily"
fab:fab_size="mini"
fab:fab_label="@string/new_daily" />
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.todo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
android:src="@drawable/add_todo"
fab:fab_size="mini"
fab:fab_label="@string/new_todo" />
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/add_todo"
fab:fab_size="mini"
fab:fab_label="@string/new_todo" />
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
<com.github.clans.fab.FloatingActionButton
android:id="@+id/fab.new.reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
fab:fab_colorNormal="@color/white"
fab:fab_colorPressed="@color/brand_500"
fab:fab_colorRipple="#FFFFFF"
android:src="@drawable/add_rewards"
fab:fab_size="mini"
fab:fab_label="@string/new_reward" />
fab:fab_shadowColor="#000"
fab:fab_elevationCompat="4dp"
android:src="@drawable/add_rewards"
fab:fab_size="mini"
fab:fab_label="@string/new_reward" />
</com.github.clans.fab.FloatingActionMenu>
</com.github.clans.fab.FloatingActionMenu>

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

@ -2,7 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/white">
<LinearLayout
android:id="@+id/gearElementsLayout"
@ -16,7 +17,9 @@
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center_vertical"
android:padding="8dp" />
android:layout_margin="12dp"
android:scaleType="center"
tools:src="@drawable/custom_reward"/>
<LinearLayout
android:id="@+id/textReward"
@ -27,7 +30,6 @@
android:orientation="vertical"
android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingEnd="@dimen/reward_spacing"
android:paddingLeft="12dp"
android:paddingRight="@dimen/reward_spacing"
android:paddingStart="12dp"
android:paddingTop="@dimen/task_top_bottom_padding">

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
View file

@ -29,8 +29,10 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent;
import com.habitrpg.android.habitica.events.TaskTappedEvent;
import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
import com.habitrpg.android.habitica.models.TutorialStep;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.models.user.HabitRPGUser;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
@ -38,21 +40,15 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
import com.habitrpg.android.habitica.models.user.HabitRPGUser;
import com.habitrpg.android.habitica.models.TutorialStep;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.raizlabs.android.dbflow.sql.builder.Condition;
import com.raizlabs.android.dbflow.sql.language.Select;
import com.roughike.bottombar.BottomBarTab;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.inject.Inject;