diff --git a/app/src/main/java/com/hiddenramblings/tagmo/EditorTP.java b/app/src/main/java/com/hiddenramblings/tagmo/EditorTP.java index 0a132166b..1ea1df540 100644 --- a/app/src/main/java/com/hiddenramblings/tagmo/EditorTP.java +++ b/app/src/main/java/com/hiddenramblings/tagmo/EditorTP.java @@ -17,7 +17,7 @@ @EActivity(R.layout.activity_editor_tp) @OptionsMenu({R.menu.editor_menu}) public class EditorTP extends AppCompatActivity { - public static final int WOLF_LINK_ID = 0x01030000; + public static final long WOLF_LINK_ID = 0x01030000024F0902L; private static final String TAG = "EditorTP"; diff --git a/app/src/main/java/com/hiddenramblings/tagmo/MainActivity.java b/app/src/main/java/com/hiddenramblings/tagmo/MainActivity.java index 0fbbdd144..baafaa053 100644 --- a/app/src/main/java/com/hiddenramblings/tagmo/MainActivity.java +++ b/app/src/main/java/com/hiddenramblings/tagmo/MainActivity.java @@ -586,6 +586,16 @@ public void onDismissed(Snackbar snackbar, int event) { int ssbVisibility = View.GONE; int tpVisibility = View.GONE; + try { + long amiiboId = TagUtil.amiiboIdFromTag(currentTagData); + if (amiiboId == EditorTP.WOLF_LINK_ID) { + tpVisibility = View.VISIBLE; + } else { + ssbVisibility = View.VISIBLE; + } + } catch (Exception e) { + e.printStackTrace(); + } AmiiboView fragment = (AmiiboView) getSupportFragmentManager().findFragmentById(R.id.amiiboInfoView); if (fragment != null) { diff --git a/app/src/main/res/layout/amiibo_compact_card.xml b/app/src/main/res/layout/amiibo_compact_card.xml index 6d647fe48..1f581d25d 100644 --- a/app/src/main/res/layout/amiibo_compact_card.xml +++ b/app/src/main/res/layout/amiibo_compact_card.xml @@ -12,35 +12,30 @@ android:foreground="@drawable/card_foreground" app:cardCornerRadius="@dimen/card_radius"> - + android:orientation="horizontal" + android:padding="8dp"> + + - - + android:layout_gravity="center_vertical" + android:layout_weight="1"> @@ -49,9 +44,7 @@ android:id="@+id/group1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignWithParentIfMissing="true" - android:layout_below="@id/txtName" - android:layout_toRightOf="@id/imageAmiibo"> + android:layout_below="@+id/txtName"> + android:layout_below="@+id/group1"> - - + + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/amiibo_large_card.xml b/app/src/main/res/layout/amiibo_large_card.xml index 52654a8e1..d1396b41f 100644 --- a/app/src/main/res/layout/amiibo_large_card.xml +++ b/app/src/main/res/layout/amiibo_large_card.xml @@ -12,31 +12,27 @@ android:foreground="@drawable/card_foreground" app:cardCornerRadius="@dimen/card_radius"> - + android:orientation="vertical" + android:padding="8dp"> - + android:layout_height="150dp" + android:visibility="gone"/> - + @@ -45,9 +41,7 @@ android:id="@+id/group1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/txtName" - android:paddingLeft="8dp" - android:paddingRight="8dp"> + android:layout_below="@+id/txtName"> + android:layout_below="@+id/group1"> - - + + + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/amiibo_simple_card.xml b/app/src/main/res/layout/amiibo_simple_card.xml index a0ea178c0..e3a7960e8 100644 --- a/app/src/main/res/layout/amiibo_simple_card.xml +++ b/app/src/main/res/layout/amiibo_simple_card.xml @@ -15,121 +15,111 @@ + android:layout_gravity="center_vertical" + android:padding="8dp"> + + + android:layout_below="@+id/txtName"> + + + android:textSize="10dp"/> - - - + android:layout_alignParentRight="true" + android:layout_toLeftOf="@+id/divider1" + android:gravity="end" + android:text="AMIIBO TYPE" + android:textColor="@color/tag_text" + android:textSize="10dp"/> + - + - - + - - - - - - - - + android:layout_alignParentLeft="true" + android:layout_toRightOf="@+id/divider2" + android:text="GAME SERIES" + android:textColor="@color/tag_text" + android:textSize="10dp"/> + android:layout_alignParentRight="true" + android:layout_toLeftOf="@+id/divider2" + android:text="AMIIBO SERIES" + android:textColor="@color/tag_text" + android:textSize="10dp"/> + android:layout_alignBottom="@id/group2" + android:layout_alignTop="@id/txtName" + android:gravity="center" + android:text=""/> + + \ No newline at end of file