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 conflicts. Fixes #104

Browse source
This commit is contained in:
Franze Jr 2015-12-05 13:01:59 -03:00
commit 61aa230b42
6 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
android:clickable="false" android:clickable="false"
> >
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
@ -33,30 +33,35 @@
android:layout_height="60dp" android:layout_height="60dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:visibility='@{reward.specialTag == "item" ? View.VISIBLE : View.GONE}' android:visibility='@{reward.specialTag == "item" ? View.VISIBLE : View.GONE}'
bind:imageName='@{"shop_"+reward.id}'/> bind:imageName='@{"shop_"+reward.id}'
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<LinearLayout <LinearLayout
android:id="@+id/textReward" android:id="@+id/textReward"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingBottom="@dimen/task_top_bottom_padding" android:paddingBottom="@dimen/task_top_bottom_padding"
android:paddingTop="@dimen/task_top_bottom_padding" android:paddingTop="@dimen/task_top_bottom_padding"
android:paddingLeft='16dp' android:paddingLeft='16dp'
android:paddingRight="@dimen/reward_spacing"> android:paddingRight="@dimen/reward_spacing"
android:layout_toLeftOf="@+id/btnReward"
android:layout_toRightOf="@+id/imageView3"
android:layout_toEndOf="@+id/imageView3">
<TextView <TextView
android:id="@+id/checkedTextView" android:id="@+id/checkedTextView"
style="@style/CardTitle" style="@style/CardTitle"
android:layout_width="300dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{reward.text}"/> android:text="@{reward.text}"/>
<TextView <TextView
android:id="@+id/notesTextView" android:id="@+id/notesTextView"
style="@style/CardText" style="@style/CardText"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{reward.notes}" android:text="@{reward.notes}"
android:visibility="@{reward.notes != null ? View.VISIBLE : View.GONE}"/> android:visibility="@{reward.notes != null ? View.VISIBLE : View.GONE}"/>
@ -65,20 +70,22 @@
<Button <Button
android:id="@+id/btnReward" android:id="@+id/btnReward"
android:layout_width="60dp" android:layout_width="80dp"
android:layout_height="30dp" android:layout_height="45dp"
android:layout_marginRight="8dp"
android:textColor="@color/white" android:textColor="@color/white"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:textSize="15sp" android:textSize="15sp"
android:drawableLeft="@drawable/ic_header_gold" android:drawableLeft="@drawable/ic_header_gold"
android:text='@{String.format("%.0f", reward.value)}' android:text='@{String.format("%.0f", reward.value)}'
android:background="@drawable/rounded_purple_square" android:background="@drawable/rounded_purple_square"
android:layout_weight="2" android:paddingLeft="6dp"
android:layout_marginRight="10dp" android:layout_centerVertical="true"
android:paddingLeft="6dp" /> android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</LinearLayout> </RelativeLayout>
<View <View
android:id="@+id/bottomBorderView" android:id="@+id/bottomBorderView"
android:layout_width="match_parent" android:layout_width="match_parent"

1
Habitica/res/values/strings.xml
View file

@ -193,4 +193,5 @@
<string name="reminder_title">Remember to check off your Dailies!</string> <string name="reminder_title">Remember to check off your Dailies!</string>
<string name="skill_progress_title">Using Skill</string> <string name="skill_progress_title">Using Skill</string>
<string name="coming_soon">Coming Soon</string>
</resources> </resources>

10
Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
View file

@ -79,12 +79,12 @@ public class MainDrawerBuilder {
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tavern)).withIdentifier(SIDEBAR_TAVERN), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tavern)).withIdentifier(SIDEBAR_TAVERN),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_party)).withIdentifier(SIDEBAR_PARTY), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_party)).withIdentifier(SIDEBAR_PARTY),
/*new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_guilds)), /*new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_guilds)),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)),*/
new SectionDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory)), new SectionDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory)),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)).withEnabled(false).withBadge(R.string.coming_soon),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)).withEnabled(false).withBadge(R.string.coming_soon),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)),*/ new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)).withEnabled(false).withBadge(R.string.coming_soon),
new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE),
new DividerDrawerItem(), new DividerDrawerItem(),
@ -117,7 +117,7 @@ public class MainDrawerBuilder {
fragment = new TavernFragment(); fragment = new TavernFragment();
break; break;
} }
case SIDEBAR_PURCHASE:{ case SIDEBAR_PURCHASE: {
fragment = new GemsPurchaseFragment(); fragment = new GemsPurchaseFragment();
break; break;
} }

7
Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
View file

@ -511,11 +511,14 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (v == btnReward) { if (v == btnReward) {
BuyRewardCommand event = new BuyRewardCommand();
event.Reward = Item;
EventBus.getDefault().post(event);
} else {
LinearLayout contentViewForDialog = createContentViewForGearDialog(); LinearLayout contentViewForDialog = createContentViewForGearDialog();
MaterialDialog dialog = createGearDialog(contentViewForDialog); MaterialDialog dialog = createGearDialog(contentViewForDialog);
dialog.show(); dialog.show();
} else super.onClick(v); };
} }
private MaterialDialog createGearDialog(LinearLayout contentViewForDialog) { private MaterialDialog createGearDialog(LinearLayout contentViewForDialog) {

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
View file

@ -74,7 +74,7 @@ public class PreferencesFragment extends PreferenceFragment implements SharedPre
private void scheduleNotifications() { private void scheduleNotifications() {
String timeval = getPreferenceManager().getSharedPreferences().getString("reminder_time", null); String timeval = getPreferenceManager().getSharedPreferences().getString("reminder_time", "19:00");
if (timeval != null) { if (timeval != null) {
String[] pieces = timeval.split(":"); String[] pieces = timeval.split(":");

6
Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
View file

@ -322,9 +322,9 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O
} }
}); });
if (tabLayout != null) {
tabLayout.setupWithViewPager(viewPager); tabLayout.setupWithViewPager(viewPager);
}
} }
public void updateUserData(HabitRPGUser user) { public void updateUserData(HabitRPGUser user) {