diff --git a/Habitica/res/drawable-mdpi/login_background.png b/Habitica/res/drawable-mdpi/login_background.png index 5da3913eb..6d763acbc 100644 Binary files a/Habitica/res/drawable-mdpi/login_background.png and b/Habitica/res/drawable-mdpi/login_background.png differ diff --git a/Habitica/res/drawable/setup_customization_bg.xml b/Habitica/res/drawable/setup_customization_bg.xml index 515f856bb..8a74eb32f 100644 --- a/Habitica/res/drawable/setup_customization_bg.xml +++ b/Habitica/res/drawable/setup_customization_bg.xml @@ -1,8 +1,8 @@ - + - + diff --git a/Habitica/res/drawable/setup_customization_bg_selected.xml b/Habitica/res/drawable/setup_customization_bg_selected.xml index 690256892..87c99b359 100644 --- a/Habitica/res/drawable/setup_customization_bg_selected.xml +++ b/Habitica/res/drawable/setup_customization_bg_selected.xml @@ -3,7 +3,7 @@ - + diff --git a/Habitica/res/drawable/setup_customization_circle.xml b/Habitica/res/drawable/setup_customization_circle.xml index 59f17d3c5..aec0612c1 100644 --- a/Habitica/res/drawable/setup_customization_circle.xml +++ b/Habitica/res/drawable/setup_customization_circle.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/white_rounded_bg.xml b/Habitica/res/drawable/white_rounded_bg.xml new file mode 100644 index 000000000..6661d90cf --- /dev/null +++ b/Habitica/res/drawable/white_rounded_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml index 69b1a48b4..b058ffd0a 100644 --- a/Habitica/res/layout/activity_setup.xml +++ b/Habitica/res/layout/activity_setup.xml @@ -2,7 +2,7 @@ - + android:layout_marginTop="6dp" + /> \ No newline at end of file diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml index 96efd7292..2a6d808b5 100644 --- a/Habitica/res/layout/speechbubble.xml +++ b/Habitica/res/layout/speechbubble.xml @@ -7,8 +7,8 @@ android:background="@color/transparent"> @@ -17,12 +17,13 @@ android:id="@+id/textView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@drawable/white_rounded_bg" android:paddingLeft="21dp" android:paddingTop="16dp" android:paddingRight="21dp" android:paddingBottom="14dp" android:layout_marginTop="74dp" + style="@style/Body1" tools:text="@string/welcome_text"/> getGlasses() { return Arrays.asList( - SetupCustomization.createGlasses("", 0), + SetupCustomization.createGlasses("eyewear_base_0", R.drawable.creator_blank_face), SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe), SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe), SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe), @@ -111,20 +113,20 @@ public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepos ); } - private List getHairBases() { + private List getHairBases(String color) { return Arrays.asList( SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face), - SetupCustomization.createHairPonytail("1", R.drawable.creator_hair_base_1_red), - SetupCustomization.createHairPonytail("3", R.drawable.creator_hair_base_3_red) + SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_"+color)), + SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_"+color)) ); } - private List getBangs() { + private List getBangs(String color) { return Arrays.asList( SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face), - SetupCustomization.createHairBangs("1", R.drawable.creator_hair_bangs_1_red), - SetupCustomization.createHairBangs("2", R.drawable.creator_hair_bangs_2_red), - SetupCustomization.createHairBangs("3", R.drawable.creator_hair_bangs_3_red) + SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_"+color)), + SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_"+color)), + SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_"+color)) ); } @@ -169,4 +171,14 @@ public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepos SetupCustomization.createSkin("6bd049", R.color.skin_6bd049) ); } + + private int getResId(String resName) { + + try { + return context.getResources().getIdentifier(resName, "drawable", context.getPackageName()); + } catch (Exception e) { + e.printStackTrace(); + return -1; + } + } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java index 948a17a85..5f46ddd3b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java @@ -54,6 +54,7 @@ public class AvatarView extends View { private boolean showBackground = true; private boolean showMount = true; private boolean showPet = true; + private boolean showSleeping = true; private boolean hasBackground; private boolean hasMount; private boolean hasPet; @@ -107,6 +108,7 @@ public class AvatarView extends View { showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true); showMount = a.getBoolean(R.styleable.AvatarView_showMount, true); showPet = a.getBoolean(R.styleable.AvatarView_showPet, true); + showSleeping = a.getBoolean(R.styleable.AvatarView_showSleeping, true); } finally { a.recycle(); } @@ -191,6 +193,11 @@ public class AvatarView extends View { layerMap.put(LayerType.BACKGROUND, "background_" + backgroundName); if (resetHasAttributes) hasBackground = true; } + + if (showSleeping && user.getPreferences().getSleep()) { + layerMap.put(AvatarView.LayerType.ZZZ, "zzz"); + } + return layerMap; } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java index c3ea65f3b..5646609aa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java @@ -10,6 +10,7 @@ import android.support.v7.preference.PreferenceManager; import android.view.View; import android.widget.Button; +import com.habitrpg.android.habitica.ui.views.FadingViewPager; import com.magicmicky.habitrpgwrapper.lib.api.ApiClient; import com.habitrpg.android.habitica.HostConfig; import com.habitrpg.android.habitica.R; @@ -68,7 +69,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang @Inject protected HostConfig hostConfig; @BindView(R.id.view_pager) - ViewPager pager; + FadingViewPager pager; @BindView(R.id.nextButton) Button nextButton; @BindView(R.id.previousButton) @@ -107,8 +108,16 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { Window window = getWindow(); - window.setStatusBarColor(ContextCompat.getColor(this, R.color.days_gray)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + View decor = getWindow().getDecorView(); + decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + window.setStatusBarColor(ContextCompat.getColor(this, R.color.light_gray_bg)); + } else { + window.setStatusBarColor(ContextCompat.getColor(this, R.color.days_gray)); + } } + + pager.disableFading = true; } @Override diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java index 00280f097..afbec2b60 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java @@ -58,7 +58,6 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter