sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change ClassSelectionActivity to use AvatarView

Browse source
This commit is contained in:
nivl4 2016-05-23 14:04:51 +08:00
parent 30b72cf8f4
commit 5c077e7489
2 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Habitica/res/layout/activity_class_selection.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@ -17,10 +18,10 @@
android:layout_height="wrap_content"
style="@style/CardContent"
android:background="@drawable/selection_highlight">
<ImageView
<com.habitrpg.android.habitica.ui.AvatarView
android:id="@+id/healerAvatarView"
android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height"
android:id="@+id/healerImageView" />
android:layout_height="@dimen/avatar_header_height" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -49,10 +50,10 @@
android:layout_height="wrap_content"
style="@style/CardContent"
android:background="@drawable/selection_highlight">
<ImageView
<com.habitrpg.android.habitica.ui.AvatarView
android:id="@+id/mageAvatarView"
android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height"
android:id="@+id/mageImageView" />
android:layout_height="@dimen/avatar_header_height" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -81,10 +82,10 @@
android:layout_height="wrap_content"
style="@style/CardContent"
android:background="@drawable/selection_highlight">
<ImageView
<com.habitrpg.android.habitica.ui.AvatarView
android:id="@+id/rogueAvatarView"
android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height"
android:id="@+id/rogueImageView" />
android:layout_height="@dimen/avatar_header_height" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -113,10 +114,10 @@
android:layout_height="wrap_content"
style="@style/CardContent"
android:background="@drawable/selection_highlight">
<ImageView
<com.habitrpg.android.habitica.ui.AvatarView
android:id="@+id/warriorAvatarView"
android:layout_width="@dimen/avatar_header_width"
android:layout_height="@dimen/avatar_header_height"
android:id="@+id/warriorImageView" />
android:layout_height="@dimen/avatar_header_height" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

35
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java
View file

@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.activities;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.userpicture.UserPicture;
import com.habitrpg.android.habitica.ui.AvatarView;
import com.magicmicky.habitrpgwrapper.lib.models.Gear;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.magicmicky.habitrpgwrapper.lib.models.Hair;
@ -15,7 +15,6 @@ import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.widget.ImageView;
import java.util.HashMap;
import java.util.Map;
@ -30,14 +29,14 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
Boolean classWasUnset = false;
Boolean shouldFinish = false;
@BindView(R.id.healerImageView)
ImageView healerImageView;
@BindView(R.id.mageImageView)
ImageView mageImageView;
@BindView(R.id.rogueImageView)
ImageView rogueImageView;
@BindView(R.id.warriorImageView)
ImageView warriorImageView;
@BindView(R.id.healerAvatarView)
AvatarView healerAvatarView;
@BindView(R.id.mageAvatarView)
AvatarView mageAvatarView;
@BindView(R.id.rogueAvatarView)
AvatarView rogueAvatarView;
@BindView(R.id.warriorAvatarView)
AvatarView warriorAvatarView;
APIHelper apiHelper;
@ -77,18 +76,14 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
healerOutfit.setShield("shield_healer_5");
healerOutfit.setWeapon("weapon_healer_6");
HabitRPGUser healer = this.makeUser(preferences, healerOutfit);
UserPicture healerUserPicture = new UserPicture(this);
healerUserPicture.setUser(healer);
healerUserPicture.setPictureOn(healerImageView);
healerAvatarView.setUser(healer);
Outfit mageOutfit = new Outfit();
mageOutfit.setArmor("armor_wizard_5");
mageOutfit.setHead("head_wizard_5");
mageOutfit.setWeapon("weapon_wizard_6");
HabitRPGUser mage = this.makeUser(preferences, mageOutfit);
UserPicture mageUserPicture = new UserPicture(this);
mageUserPicture.setUser(mage);
mageUserPicture.setPictureOn(mageImageView);
mageAvatarView.setUser(mage);
Outfit rogueOutfit = new Outfit();
rogueOutfit.setArmor("armor_rogue_5");
@ -96,9 +91,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
rogueOutfit.setShield("shield_rogue_6");
rogueOutfit.setWeapon("weapon_rogue_6");
HabitRPGUser rogue = this.makeUser(preferences, rogueOutfit);
UserPicture rogueUserPicture = new UserPicture(this);
rogueUserPicture.setUser(rogue);
rogueUserPicture.setPictureOn(rogueImageView);
rogueAvatarView.setUser(rogue);
Outfit warriorOutfit = new Outfit();
warriorOutfit.setArmor("armor_warrior_5");
@ -106,9 +99,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
warriorOutfit.setShield("shield_warrior_5");
warriorOutfit.setWeapon("weapon_warrior_6");
HabitRPGUser warrior = this.makeUser(preferences, warriorOutfit);
UserPicture warriorUserPicture = new UserPicture(this);
warriorUserPicture.setUser(warrior);
warriorUserPicture.setPictureOn(warriorImageView);
warriorAvatarView.setUser(warrior);
if (!isInitialSelection) {
apiHelper.apiService.changeClass()