Skip to content

Commit

Permalink
Merge pull request #65 from North101/cleanups
Browse files Browse the repository at this point in the history 
Show list of items when clicking database stats
  • Loading branch information
@North101
North101 authored Aug 1, 2017
2 parents f956b43 + f3bebbd commit caf096c
Show file tree
Hide file tree
Showing 9 changed files with 416 additions and 251 deletions.
6 changes: 2 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:gridlayout-v7:25.3.1'
apt "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
compile 'org.parceler:parceler-api:1.1.9'
apt 'org.parceler:parceler:1.1.9'
compile 'com.journeyapps:zxing-android-embedded:3.5.0'
compile 'com.robertlevonyan.view:MaterialChipView:1.0.1'
compile 'org.apmem.tools:layouts:1.10@aar'
compile 'org.parceler:parceler-api:1.1.9'
annotationProcessor 'org.parceler:parceler:1.1.9'
}
26 changes: 22 additions & 4 deletions app/src/main/java/com/hiddenramblings/tagmo/BrowserActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,32 @@ public class BrowserActivity extends AppCompatActivity implements SearchView.OnQ
Preferences_ prefs;

@Parcel(Parcel.Serialization.BEAN)
class AmiiboFile {
public final String filePath;
public final long id;
public static class AmiiboFile {
public String filePath;
public long id;

@ParcelConstructor
public AmiiboFile(String filePath, long id) {
this.filePath = filePath;
this.id = id;
}

public String getFilePath() {
return filePath;
}

public void setFilePath(String filePath) {
this.filePath = filePath;
}

public long getId() {
return id;
}

public void setId(long id) {
this.id = id;
}

}

@AfterViews
Expand Down Expand Up @@ -833,7 +850,7 @@ SpannableStringBuilder boldStartText(String text, String query) {
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
if (convertView == null) {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.amiibo_info_view, parent, false);
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.amiibo_item_view, parent, false);
holder = new ViewHolder(convertView);
} else {
holder = (ViewHolder) convertView.getTag();
Expand Down Expand Up @@ -882,6 +899,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
setAmiiboInfoText(holder.txtCharacter, boldMatchingText(character, query), !tagInfo.isEmpty());

holder.txtPath.setText(boldMatchingText(Util.friendlyPath(item.filePath), query));
holder.txtPath.setVisibility(View.VISIBLE);

return convertView;
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/hiddenramblings/tagmo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ public void onClick(DialogInterface dialog, int which) {
String amiiboType = "";
String gameSeries = "";
String character = "";
int ssbVisibility = View.INVISIBLE;
int tpVisibility = View.INVISIBLE;
int ssbVisibility = View.GONE;
int tpVisibility = View.GONE;

if (this.currentTagData == null) {
tagInfo = "<No tag loaded>";
Expand Down
204 changes: 204 additions & 0 deletions app/src/main/java/com/hiddenramblings/tagmo/SettingsActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,32 @@
package com.hiddenramblings.tagmo;

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.support.annotation.NonNull;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.BaseAdapter;
import android.widget.TextView;
import android.widget.Toast;

import com.hiddenramblings.tagmo.amiibo.Amiibo;
import com.hiddenramblings.tagmo.amiibo.AmiiboManager;
import com.hiddenramblings.tagmo.amiibo.AmiiboSeries;
import com.hiddenramblings.tagmo.amiibo.AmiiboType;
import com.hiddenramblings.tagmo.amiibo.Character;
import com.hiddenramblings.tagmo.amiibo.GameSeries;

import org.androidannotations.annotations.AfterPreferences;
import org.androidannotations.annotations.Background;
Expand All @@ -29,6 +43,9 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

@PreferenceScreen(R.xml.settings)
@EActivity
Expand Down Expand Up @@ -222,6 +239,193 @@ void onEnableAmiiboBrowserClicked() {
prefs.enableAmiiboBrowser().put(enableAmiiboBrowser.isChecked());
}

@PreferenceClick(R.string.settings_database_amiibos)
void onAmiiboStatsClicked() {
final ArrayList<Amiibo> items = new ArrayList<>(amiiboManager.amiibos.values());
Collections.sort(items);

AlertDialog dialog = new AlertDialog.Builder(this)
.setTitle("Amiibos")
.setAdapter(new BaseAdapter() {
@Override
public int getCount() {
return items.size();
}

@Override
public long getItemId(int i) {
return items.get(i).id;
}

@Override
public Amiibo getItem(int i) {
return items.get(i);
}

@Override
public View getView(int position, View convertView, ViewGroup parent) {
ViewHolder holder;
if (convertView == null) {
convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.amiibo_item_view, parent, false);
holder = new ViewHolder(convertView);
} else {
holder = (ViewHolder) convertView.getTag();
}

String tagInfo = "";
String amiiboHexId = "";
String amiiboName = "";
String amiiboSeries = "";
String amiiboType = "";
String gameSeries = "";
String character = "";

Amiibo amiibo = getItem(position);
amiiboHexId = TagUtil.amiiboIdToHex(amiibo.id);
if (amiibo.name != null)
amiiboName = amiibo.name;
if (amiibo.getAmiiboSeries() != null)
amiiboSeries = amiibo.getAmiiboSeries().name;
if (amiibo.getAmiiboType() != null)
amiiboType = amiibo.getAmiiboType().name;
if (amiibo.getGameSeries() != null)
gameSeries = amiibo.getGameSeries().name;
if (amiibo.getCharacter() != null)
character = amiibo.getCharacter().name;

holder.txtTagInfo.setText(tagInfo);
setAmiiboInfoText(holder.txtName, amiiboName, !tagInfo.isEmpty());
setAmiiboInfoText(holder.txtTagId, amiiboHexId, !tagInfo.isEmpty());
setAmiiboInfoText(holder.txtAmiiboSeries, amiiboSeries, !tagInfo.isEmpty());
setAmiiboInfoText(holder.txtAmiiboType, amiiboType, !tagInfo.isEmpty());
setAmiiboInfoText(holder.txtGameSeries, gameSeries, !tagInfo.isEmpty());
setAmiiboInfoText(holder.txtCharacter, character, !tagInfo.isEmpty());

return convertView;
}

void setAmiiboInfoText(TextView textView, CharSequence text, boolean hasTagInfo) {
if (hasTagInfo) {
textView.setText("");
} else if (text.length() == 0) {
textView.setText("Unknown");
textView.setTextColor(Color.RED);
} else {
textView.setText(text);
textView.setTextColor(textView.getTextColors().getDefaultColor());
}
}

class ViewHolder {
TextView txtTagInfo;
TextView txtName;
TextView txtTagId;
TextView txtAmiiboSeries;
TextView txtAmiiboType;
TextView txtGameSeries;
TextView txtCharacter;
TextView txtPath;

public ViewHolder(View view) {
this.txtTagInfo = ((TextView) view.findViewById(R.id.txtTagInfo));
this.txtName = ((TextView) view.findViewById(R.id.txtName));
this.txtTagId = ((TextView) view.findViewById(R.id.txtTagId));
this.txtAmiiboSeries = ((TextView) view.findViewById(R.id.txtAmiiboSeries));
this.txtAmiiboType = ((TextView) view.findViewById(R.id.txtAmiiboType));
this.txtGameSeries = ((TextView) view.findViewById(R.id.txtGameSeries));
this.txtCharacter = ((TextView) view.findViewById(R.id.txtCharacter));
this.txtPath = ((TextView) view.findViewById(R.id.txtPath));

view.setTag(this);
}
}
}, null)
.setPositiveButton("Close", null)
.show();
}

@PreferenceClick(R.string.settings_database_game_series)
void onGameSeriesStatsClicked() {
final ArrayList<String> items = new ArrayList<>();
for (GameSeries gameSeries : amiiboManager.gameSeries.values()) {
if (!items.contains(gameSeries.name))
items.add(gameSeries.name);
}
Collections.sort(items);

new AlertDialog.Builder(this)
.setTitle("Game Series")
.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, items), null)
.setPositiveButton("Close", null)
.show();
}

@PreferenceClick(R.string.settings_database_characters)
void onCharacterStatsClicked() {
final ArrayList<Character> items = new ArrayList<>();
for (Character character : amiiboManager.characters.values()) {
if (!items.contains(character))
items.add(character);
}
Collections.sort(items);

new AlertDialog.Builder(this)
.setTitle("Characters")
.setAdapter(new ArrayAdapter<Character>(this, android.R.layout.simple_list_item_2, android.R.id.text1, items) {
@NonNull
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent);
TextView text1 = (TextView) view.findViewById(android.R.id.text1);
TextView text2 = (TextView) view.findViewById(android.R.id.text2);

Character character = getItem(position);
text1.setText(character.name);

GameSeries gameSeries = character.getGameSeries();
text2.setText(gameSeries == null ? "" : gameSeries.name);

return view;
}
}, null)
.setPositiveButton("Close", null)
.show();
}

@PreferenceClick(R.string.settings_database_amiibo_series)
void onAmiiboSeriesStatsClicked() {
final ArrayList<String> items = new ArrayList<>();
for (AmiiboSeries amiiboSeries : amiiboManager.amiiboSeries.values()) {
if (!items.contains(amiiboSeries.name))
items.add(amiiboSeries.name);
}
Collections.sort(items);

new AlertDialog.Builder(this)
.setTitle("Amiibo Series")
.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, items), null)
.setPositiveButton("Close", null)
.show();
}

@PreferenceClick(R.string.settings_database_amiibo_types)
void onAmiiboTypesStatsClicked() {
final ArrayList<AmiiboType> amiiboTypes = new ArrayList<>(amiiboManager.amiiboTypes.values());
Collections.sort(amiiboTypes);

final ArrayList<String> items = new ArrayList<>();
for (AmiiboType amiiboType : amiiboTypes) {
if (!items.contains(amiiboType.name))
items.add(amiiboType.name);
}

new AlertDialog.Builder(this)
.setTitle("Amiibo Types")
.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, items), null)
.setPositiveButton("Close", null)
.show();
}

private void showFileChooser(String title, String mimeType, int resultCode) {
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
intent.setType(mimeType);
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/hiddenramblings/tagmo/amiibo/Character.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ public Character(AmiiboManager manager, String id, String name) {
this(manager, hexToId(id), name);
}

public int getGameSeriesId() {
return this.id & GameSeries.MASK;
}

public GameSeries getGameSeries() {
return this.manager.gameSeries.get(this.getGameSeriesId());
}

public static int hexToId(String value) {
return (Integer.decode(value) << BITSHIFT) & MASK;
}
Expand Down
Loading

0 comments on commit caf096c

Please sign in to comment.