diff --git a/Habitica/res/drawable/pill_bg_green.xml b/Habitica/res/drawable/pill_bg_green.xml index 3c8e06bf7..873c7a182 100644 --- a/Habitica/res/drawable/pill_bg_green.xml +++ b/Habitica/res/drawable/pill_bg_green.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml index ccbf310c4..fe3696b6f 100644 --- a/Habitica/res/layout/fragment_subscription.xml +++ b/Habitica/res/layout/fragment_subscription.xml @@ -76,7 +76,8 @@ android:layout_height="wrap_content" android:id="@+id/subscribeButton" android:layout_gravity="center" - style="@style/Button.Purple"/> + style="@style/Button.Purple" + android:layout_marginTop="8dp"/> @@ -96,7 +97,9 @@ android:textSize="16sp" android:lineSpacingExtra="4dp" android:layout_marginTop="23dp" - android:layout_marginBottom="12dp"/> + android:layout_marginBottom="12dp" + android:layout_marginLeft="26dp" + android:layout_marginRight="26dp"/> 12sp @drawable/ic_check_purple center + 4dp diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java index 88a288560..613bf8980 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java @@ -12,6 +12,8 @@ import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.From; import com.raizlabs.android.dbflow.sql.language.Select; +import java.util.Locale; + import rx.functions.Action1; /** @@ -57,7 +59,7 @@ public class TaskScoringCallback implements Action1 { String type = taskDirectionData.get_tmp().getDrop().getType(); From from = null; - switch (type.toLowerCase()) { + switch (type.toLowerCase(Locale.US)) { case "hatchingpotion": from = new Select().from(HatchingPotion.class); break; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java index 16e7327e5..54f440c3b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java @@ -23,6 +23,8 @@ import android.util.Log; import android.view.View; import android.widget.TextView; +import java.util.Locale; + /** * Created by Negue on 14.06.2015. */ @@ -117,7 +119,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener { lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl())); lvlText.setCompoundDrawables(null, null, null, null); } else { - lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase() + userClass.substring(1))); + lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase(Locale.getDefault()) + userClass.substring(1))); Drawable drawable; switch (stats.get_class()) { case warrior: diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java index cf9d92e47..083c26a1a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java @@ -85,7 +85,7 @@ public class SubscriptionOptionView extends FrameLayout { int verticalPadding = (int) getResources().getDimension(R.dimen.pill_vertical_padding); if (purchased) { subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_selected); - subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_100); + subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_300); gemCapTextView.setBackgroundResource(R.drawable.pill_bg_green); gemCapTextView.setTextColor(getContext().getResources().getColor(R.color.white)); gemCapTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java index 3f9c024ab..d1f8e70d2 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java @@ -236,6 +236,9 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis } fragment.setListener(GemPurchaseActivity.this); fragment.setupCheckout(); + if (billingRequests != null) { + fragment.setBillingRequests(billingRequests); + } return (Fragment)fragment; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java index 3fd9a2e9e..9e8764db7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.java @@ -19,6 +19,7 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import butterknife.BindView; import butterknife.ButterKnife; @@ -104,12 +105,12 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter filteredGuilds = null; + List filteredGuilds; if(constraint.length() == 0) { filteredGuilds = fullPublicGuildList; } else { - filteredGuilds = getFilteredResults(constraint.toString().toLowerCase()); + filteredGuilds = getFilteredResults(constraint.toString().toLowerCase(Locale.US)); } FilterResults results = new FilterResults(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java index e57b88d8a..3dc6ce4f1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java @@ -17,6 +17,7 @@ import org.solovyev.android.checkout.Sku; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -125,6 +126,7 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct if (!aBoolean) { // no current product exist final ActivityCheckout checkout = listener.getActivityCheckout(); + Log.d("GEM", sku); billingRequests.purchase(ProductTypes.IN_APP, sku, null, checkout.getPurchaseFlow()); } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java index 1769d9566..a5357eb06 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java @@ -67,6 +67,7 @@ import android.widget.ImageView; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import javax.inject.Inject; @@ -413,7 +414,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi @Subscribe public void onEvent(AddNewTaskCommand event) { - openNewTaskActivity(event.ClassType.toLowerCase()); + openNewTaskActivity(event.ClassType.toLowerCase(Locale.US)); } @Subscribe @@ -661,6 +662,5 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi @Override - public String customTitle() { - return getString(R.string.sidebar_tasks); } + public String customTitle() { return null; } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java index 0eb54676f..3276e9ce1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java @@ -31,6 +31,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.support.v7.widget.Toolbar; +import java.util.Locale; + import static com.habitrpg.android.habitica.ui.activities.MainActivity.GEM_PURCHASE_REQUEST; public class MainDrawerBuilder { @@ -80,14 +82,14 @@ public class MainDrawerBuilder { new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tasks)).withIdentifier(SIDEBAR_TASKS), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_skills)).withIdentifier(SIDEBAR_SKILLS), - new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase()), + new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase(Locale.getDefault())), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_inbox)).withIdentifier(SIDEBAR_INBOX), 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_guilds)).withIdentifier(SIDEBAR_GUILDS), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)).withIdentifier(SIDEBAR_CHALLENGES), - new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase()), + new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase(Locale.getDefault())), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_shops)).withIdentifier(SIDEBAR_SHOPS), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)).withIdentifier(SIDEBAR_AVATAR), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)).withIdentifier(SIDEBAR_EQUIPMENT), @@ -95,7 +97,7 @@ public class MainDrawerBuilder { new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)).withIdentifier(SIDEBAR_STABLE), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE), - new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase()), + new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase(Locale.getDefault())), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_news)).withIdentifier(SIDEBAR_NEWS).withSelectable(false), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_settings)).withIdentifier(SIDEBAR_SETTINGS).withSelectable(false), new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_help)).withIdentifier(SIDEBAR_HELP),