Skip to content

Commit

Permalink
Bug #140: Added the ability to set a description on your alliance, wh…
Browse files Browse the repository at this point in the history 
…ich'll be displayed when people view the details of it.
  • Loading branch information
@codeka
codeka committed Nov 14, 2018
1 parent 17100b9 commit 56b35de
Show file tree
Hide file tree
Showing 17 changed files with 1,156 additions and 777 deletions.
25 changes: 13 additions & 12 deletions client/src/main/java/au/com/codeka/warworlds/game/alliance/AllianceActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
}

if (entry.alliance != null) {
TextView allianceName = (TextView) view.findViewById(R.id.alliance_name);
TextView allianceName = view.findViewById(R.id.alliance_name);
allianceName.setText(entry.alliance.getName());

TextView allianceMembers = (TextView) view.findViewById(R.id.alliance_num_members);
TextView allianceMembers = view.findViewById(R.id.alliance_num_members);
allianceMembers.setText(
String.format(Locale.US, "Members: %d", entry.alliance.getNumMembers()));
String.format(Locale.US, "Members: %d • Stars: %d",
entry.alliance.getNumMembers(), entry.alliance.getTotalStars()));

ImageView allianceIcon = (ImageView) view.findViewById(R.id.alliance_icon);
ImageView allianceIcon = view.findViewById(R.id.alliance_icon);
allianceIcon.setImageBitmap(
AllianceShieldManager.i.getShield(getActivity(), entry.alliance));
}
Expand Down Expand Up @@ -364,7 +365,7 @@ public View onCreateView(
mView = inflator.inflate(R.layout.alliance_requests_tab, container, false);
mRequestListAdapter = new RequestListAdapter();

ListView joinRequestsList = (ListView) mView.findViewById(R.id.join_requests);
ListView joinRequestsList = mView.findViewById(R.id.join_requests);
joinRequestsList.setAdapter(mRequestListAdapter);

joinRequestsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
Expand Down Expand Up @@ -554,13 +555,13 @@ public void run() {
return view;
}

TextView empireName = (TextView) view.findViewById(R.id.empire_name);
ImageView empireIcon = (ImageView) view.findViewById(R.id.empire_icon);
TextView requestDescription = (TextView) view.findViewById(R.id.request_description);
ImageView requestStatus = (ImageView) view.findViewById(R.id.request_status);
TextView requestVotes = (TextView) view.findViewById(R.id.request_votes);
TextView message = (TextView) view.findViewById(R.id.message);
ImageView pngImage = (ImageView) view.findViewById(R.id.png_image);
TextView empireName = view.findViewById(R.id.empire_name);
ImageView empireIcon = view.findViewById(R.id.empire_icon);
TextView requestDescription = view.findViewById(R.id.request_description);
ImageView requestStatus = view.findViewById(R.id.request_status);
TextView requestVotes = view.findViewById(R.id.request_votes);
TextView message = view.findViewById(R.id.message);
ImageView pngImage = view.findViewById(R.id.png_image);

if (entry.empire == null) {
empireName.setText("...");
Expand Down
288 changes: 152 additions & 136 deletions ...nt/src/main/java/au/com/codeka/warworlds/game/alliance/AllianceChangeDetailsActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package au.com.codeka.warworlds.game.alliance;

import java.io.ByteArrayOutputStream;
import java.util.Locale;

import android.content.Intent;
import android.graphics.Bitmap;
Expand All @@ -13,6 +14,8 @@
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;

import au.com.codeka.common.model.BaseAlliance;
import au.com.codeka.warworlds.BaseActivity;
import au.com.codeka.warworlds.ImagePickerHelper;
import au.com.codeka.warworlds.R;
Expand All @@ -29,155 +32,168 @@
import au.com.codeka.warworlds.model.ShieldManager;

public class AllianceChangeDetailsActivity extends BaseActivity {
private ImagePickerHelper mImagePickerHelper = new ImagePickerHelper(this);

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

setContentView(R.layout.alliance_change_details);

final Button changeNameBtn = (Button) findViewById(R.id.change_name_btn);
changeNameBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChangeNameClick();
}
});

final Button chooseImageBtn = (Button) findViewById(R.id.choose_image_btn);
chooseImageBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChooseImageClick();
}
});

final Button changeImageBtn = (Button) findViewById(R.id.change_image_btn);
changeImageBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChangeImageClick();
}
});
}

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mImagePickerHelper.onActivityResult(requestCode, resultCode, data);

super.onActivityResult(requestCode, resultCode, data);
}

@Override
public void onResumeFragments() {
super.onResumeFragments();

ServerGreeter.waitForHello(this, new ServerGreeter.HelloCompleteHandler() {
@Override
public void onHelloComplete(boolean success, ServerGreeting greeting) {
if (!success) {
startActivity(new Intent(AllianceChangeDetailsActivity.this, WarWorldsActivity.class));
} else {
fullRefresh();
}
}
});
}

@Override
public void onStart() {
super.onStart();
ShieldManager.eventBus.register(mEventHandler);
}

@Override
public void onStop() {
super.onStop();
ShieldManager.eventBus.unregister(mEventHandler);
private ImagePickerHelper mImagePickerHelper = new ImagePickerHelper(this);

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

setContentView(R.layout.alliance_change_details);

final Button changeNameBtn = findViewById(R.id.change_name_btn);
changeNameBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChangeNameClick();
}
});

final Button chooseImageBtn = findViewById(R.id.choose_image_btn);
chooseImageBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChooseImageClick();
}
});

final Button changeImageBtn = findViewById(R.id.change_image_btn);
changeImageBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onChangeImageClick();
}
});
}

@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
mImagePickerHelper.onActivityResult(requestCode, resultCode, data);

super.onActivityResult(requestCode, resultCode, data);
}

@Override
public void onResumeFragments() {
super.onResumeFragments();

ServerGreeter.waitForHello(this, new ServerGreeter.HelloCompleteHandler() {
@Override
public void onHelloComplete(boolean success, ServerGreeting greeting) {
if (!success) {
startActivity(new Intent(AllianceChangeDetailsActivity.this, WarWorldsActivity.class));
} else {
fullRefresh();
}
}
});
}

@Override
public void onStart() {
super.onStart();
ShieldManager.eventBus.register(mEventHandler);
}

@Override
public void onStop() {
super.onStop();
ShieldManager.eventBus.unregister(mEventHandler);
}

private void fullRefresh() {
MyEmpire myEmpire = EmpireManager.i.getEmpire();
Alliance myAlliance = (Alliance) myEmpire.getAlliance();

TextView allianceName = findViewById(R.id.alliance_name);
allianceName.setText(myAlliance.getName());

TextView allianceMembers = findViewById(R.id.alliance_num_members);
allianceMembers.setText(String.format(Locale.US, "Members: %d • Stars: %d",
myAlliance.getNumMembers(), myAlliance.getTotalStars()));

final EditText newNameEdit = findViewById(R.id.new_name);
newNameEdit.setText(myAlliance.getName());

final EditText newDescriptionEdit = findViewById(R.id.new_description);
newDescriptionEdit.setText(
myAlliance.getDescription() == null ? "" : myAlliance.getDescription());

TextView txt = findViewById(R.id.change_image_info);
txt.setText(Html.fromHtml(txt.getText().toString()));

Bitmap shield = AllianceShieldManager.i.getShield(this, myAlliance);
ImageView currentShield = findViewById(R.id.current_image);
currentShield.setImageBitmap(shield);
ImageView currentShieldSmall = findViewById(R.id.current_image_small);
currentShieldSmall.setImageBitmap(shield);
ImageView allianceIcon = findViewById(R.id.alliance_icon);
allianceIcon.setImageBitmap(shield);

loadImage();
}

private void onChangeNameClick() {
final EditText newNameEdit = findViewById(R.id.new_name);
final EditText newDescriptionEdit = findViewById(R.id.new_description);

final String newName = newNameEdit.getText().toString().trim();
final String newDescription = newDescriptionEdit.getText().toString().trim();
final Alliance myAlliance = (Alliance) EmpireManager.i.getEmpire().getAlliance();
if (newName.equals(myAlliance.getName())
&& newDescription.equals(myAlliance.getDescription())) {
new StyledDialog.Builder(this)
.setMessage("Please enter the new name and/or description you want before clicking 'Change'.")
.setTitle("Rename Alliance")
.setPositiveButton("OK", null)
.create().show();
return;
}

private void fullRefresh() {
MyEmpire myEmpire = EmpireManager.i.getEmpire();
Alliance myAlliance = (Alliance) myEmpire.getAlliance();

TextView allianceName = (TextView) findViewById(R.id.alliance_name);
allianceName.setText(myAlliance.getName());

TextView allianceMembers = (TextView) findViewById(R.id.alliance_num_members);
allianceMembers.setText(String.format("Members: %d", myAlliance.getNumMembers()));

final EditText newNameEdit = (EditText) findViewById(R.id.new_name);
newNameEdit.setText(myAlliance.getName());

TextView txt = (TextView) findViewById(R.id.change_image_info);
txt.setText(Html.fromHtml(txt.getText().toString()));

Bitmap shield = AllianceShieldManager.i.getShield(this, myAlliance);
ImageView currentShield = (ImageView) findViewById(R.id.current_image);
currentShield.setImageBitmap(shield);
ImageView currentShieldSmall = (ImageView) findViewById(R.id.current_image_small);
currentShieldSmall.setImageBitmap(shield);
ImageView allianceIcon = (ImageView) findViewById(R.id.alliance_icon);
allianceIcon.setImageBitmap(shield);

loadImage();
if (!newName.equals(myAlliance.getName())) {
AllianceManager.i.requestChangeName(myAlliance.getID(), "", newName);
}

private void onChangeNameClick() {
final EditText newNameEdit = (EditText) findViewById(R.id.new_name);

final String newName = newNameEdit.getText().toString().trim();
if (newName.equals(EmpireManager.i.getEmpire().getAlliance().getName())) {
new StyledDialog.Builder(this)
.setMessage("Please enter the new name you want before clicking 'Change'.")
.setTitle("Rename Alliance")
.setPositiveButton("OK", null)
.create().show();
return;
}

int allianceID = ((Alliance) EmpireManager.i.getEmpire().getAlliance()).getID();
AllianceManager.i.requestChangeName(allianceID, "", newName);
if (!newDescription.equals(myAlliance.getDescription())) {
AllianceManager.i.requestChangeDescription(myAlliance.getID(), "", newDescription);
}

private void onChooseImageClick() {
mImagePickerHelper.chooseImage();
}
private void onChooseImageClick() {
mImagePickerHelper.chooseImage();
}

private void onChangeImageClick() {
Bitmap bmp = mImagePickerHelper.getImage();
if (bmp == null) {
return;
}

private void onChangeImageClick() {
Bitmap bmp = mImagePickerHelper.getImage();
if (bmp == null) {
return;
}
int allianceID = ((Alliance) EmpireManager.i.getEmpire().getAlliance()).getID();

int allianceID = ((Alliance) EmpireManager.i.getEmpire().getAlliance()).getID();
ByteArrayOutputStream outs = new ByteArrayOutputStream();
bmp.compress(CompressFormat.PNG, 90, outs);

ByteArrayOutputStream outs = new ByteArrayOutputStream();
bmp.compress(CompressFormat.PNG, 90, outs);
AllianceManager.i.requestChangeImage(allianceID, "", outs.toByteArray());
}

AllianceManager.i.requestChangeImage(allianceID, "", outs.toByteArray());
private void loadImage() {
Bitmap bmp = mImagePickerHelper.getImage();
if (bmp == null) {
return;
}

private void loadImage() {
Bitmap bmp = mImagePickerHelper.getImage();
if (bmp == null) {
return;
}
ImageView currentImage = findViewById(R.id.current_image);
currentImage.setImageBitmap(bmp);
ImageView currentImageSmall = findViewById(R.id.current_image_small);
currentImageSmall.setImageBitmap(bmp);

ImageView currentImage = (ImageView) findViewById(R.id.current_image);
currentImage.setImageBitmap(bmp);
ImageView currentImageSmall = (ImageView) findViewById(R.id.current_image_small);
currentImageSmall.setImageBitmap(bmp);
// and now we can enable the 'Change' button
(findViewById(R.id.change_image_btn)).setEnabled(true);
}

// and now we can enable the 'Change' button
((Button) findViewById(R.id.change_image_btn)).setEnabled(true);;
private Object mEventHandler = new Object() {
@EventHandler
public void onShieldUpdated(ShieldManager.ShieldUpdatedEvent event) {
fullRefresh();
}

private Object mEventHandler = new Object() {
@EventHandler
public void onShieldUpdated(ShieldManager.ShieldUpdatedEvent event) {
fullRefresh();
}
};
};
}
8 changes: 8 additions & 0 deletions client/src/main/java/au/com/codeka/warworlds/game/alliance/AllianceDetailsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,14 @@ private void refreshAlliance() {
TextView allianceName = mView.findViewById(R.id.alliance_name);
allianceName.setText(mAlliance.getName());

TextView allianceDescription = mView.findViewById(R.id.description);
if (mAlliance.getDescription() != null && !mAlliance.getDescription().trim().isEmpty()) {
allianceDescription.setText(mAlliance.getDescription());
allianceDescription.setVisibility(View.VISIBLE);
} else {
allianceDescription.setVisibility(View.GONE);
}

TextView bankBalance = mView.findViewById(R.id.bank_balance);
if (bankBalance != null) {
bankBalance.setText(Cash.format(mAlliance.getBankBalance()));
Expand Down
Loading

0 comments on commit 56b35de

Please sign in to comment.