diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bae710f..550b3db 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
index e98856b..1657e38 100644
--- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
+++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.room.Room;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.tabs.TabLayout;
import me.brysonsteck.wiimmfiwatcher.database.AppDatabase;
import me.brysonsteck.wiimmfiwatcher.fragments.AboutFragment;
@@ -31,7 +32,7 @@ public class MainActivity extends AppCompatActivity {
if (savedInstanceState == null) {
aboutButton.setVisibility(View.VISIBLE);
getSupportFragmentManager().beginTransaction()
- .replace(R.id.friend_code_input_fragment, new WatchCodeFragment(), null)
+ .replace(R.id.friend_code_input_fragment, new WatchCodeFragment(true), null)
.setReorderingAllowed(true)
.commit();
}
@@ -52,6 +53,36 @@ public class MainActivity extends AppCompatActivity {
.commit();
});
+// TabLayout tabLayout = findViewById(R.id.tablayout_main);
+// tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+// @Override
+// public void onTabSelected(TabLayout.Tab tab) {
+// if (tab.getText().equals("Friend Code")) {
+// getSupportFragmentManager().beginTransaction()
+// .replace(R.id.friend_code_input_fragment, new WatchCodeFragment(true), null)
+// .setReorderingAllowed(true)
+// .commit();
+//
+// }
+// else if (tab.getText().equals("Mii Name")) {
+// getSupportFragmentManager().beginTransaction()
+// .replace(R.id.friend_code_input_fragment, new WatchCodeFragment(false), null)
+// .setReorderingAllowed(true)
+// .commit();
+// }
+// }
+
+// @Override
+// public void onTabUnselected(TabLayout.Tab tab) {
+//
+// }
+//
+// @Override
+// public void onTabReselected(TabLayout.Tab tab) {
+//
+// }
+// });
+//
}
@Override
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/fragments/WatchCodeFragment.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/fragments/WatchCodeFragment.java
index 2687518..2a63379 100644
--- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/fragments/WatchCodeFragment.java
+++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/fragments/WatchCodeFragment.java
@@ -27,9 +27,11 @@ import me.brysonsteck.wiimmfiwatcher.wiimmfi.WiimmfiActivity;
public class WatchCodeFragment extends Fragment {
ProgressDialog progressBar;
+ boolean friendCodeMode = true;
- public WatchCodeFragment() {
+ public WatchCodeFragment(boolean friendCodeMode) {
super(R.layout.watch_code_fragment);
+ this.friendCodeMode = friendCodeMode;
}
public boolean isValidFriendCode(String friendCode) {
@@ -107,6 +109,9 @@ public class WatchCodeFragment extends Fragment {
recyclerView.setAdapter(adapter);
EditText friendCode = view.findViewById(R.id.friend_code_edit_text);
+ if (!friendCodeMode) {
+ friendCode.setHint(R.string.enter_mii);
+ }
Button watchButton = view.findViewById(R.id.watch_button);
watchButton.setOnClickListener(buttonClick -> {
startWiimmfiActivity(
diff --git a/app/src/main/res/drawable/battle_bp.jpg b/app/src/main/res/drawable/battle_bp.jpg
new file mode 100644
index 0000000..1c3e4fb
Binary files /dev/null and b/app/src/main/res/drawable/battle_bp.jpg differ
diff --git a/app/src/main/res/drawable/battle_ccw.jpg b/app/src/main/res/drawable/battle_ccw.jpg
new file mode 100644
index 0000000..50c5c69
Binary files /dev/null and b/app/src/main/res/drawable/battle_ccw.jpg differ
diff --git a/app/src/main/res/drawable/battle_dp.jpg b/app/src/main/res/drawable/battle_dp.jpg
new file mode 100644
index 0000000..2746023
Binary files /dev/null and b/app/src/main/res/drawable/battle_dp.jpg differ
diff --git a/app/src/main/res/drawable/battle_fs.jpg b/app/src/main/res/drawable/battle_fs.jpg
new file mode 100644
index 0000000..644aa3e
Binary files /dev/null and b/app/src/main/res/drawable/battle_fs.jpg differ
diff --git a/app/src/main/res/drawable/battle_rbc3.jpg b/app/src/main/res/drawable/battle_rbc3.jpg
new file mode 100644
index 0000000..4f4ef46
Binary files /dev/null and b/app/src/main/res/drawable/battle_rbc3.jpg differ
diff --git a/app/src/main/res/drawable/battle_rbc4.jpg b/app/src/main/res/drawable/battle_rbc4.jpg
new file mode 100644
index 0000000..807c6db
Binary files /dev/null and b/app/src/main/res/drawable/battle_rbc4.jpg differ
diff --git a/app/src/main/res/drawable/battle_rcl.jpg b/app/src/main/res/drawable/battle_rcl.jpg
new file mode 100644
index 0000000..f93d475
Binary files /dev/null and b/app/src/main/res/drawable/battle_rcl.jpg differ
diff --git a/app/src/main/res/drawable/battle_rs.jpg b/app/src/main/res/drawable/battle_rs.jpg
new file mode 100644
index 0000000..9afd76b
Binary files /dev/null and b/app/src/main/res/drawable/battle_rs.jpg differ
diff --git a/app/src/main/res/drawable/battle_rth.jpg b/app/src/main/res/drawable/battle_rth.jpg
new file mode 100644
index 0000000..5b18c53
Binary files /dev/null and b/app/src/main/res/drawable/battle_rth.jpg differ
diff --git a/app/src/main/res/drawable/battle_td.jpg b/app/src/main/res/drawable/battle_td.jpg
new file mode 100644
index 0000000..7acfe49
Binary files /dev/null and b/app/src/main/res/drawable/battle_td.jpg differ
diff --git a/app/src/main/res/drawable/course_bc.jpg b/app/src/main/res/drawable/course_bc.jpg
new file mode 100644
index 0000000..138b970
Binary files /dev/null and b/app/src/main/res/drawable/course_bc.jpg differ
diff --git a/app/src/main/res/drawable/course_cm.jpg b/app/src/main/res/drawable/course_cm.jpg
new file mode 100644
index 0000000..f0e155b
Binary files /dev/null and b/app/src/main/res/drawable/course_cm.jpg differ
diff --git a/app/src/main/res/drawable/course_ctgp.jpg b/app/src/main/res/drawable/course_ctgp.jpg
new file mode 100644
index 0000000..75ba3c8
Binary files /dev/null and b/app/src/main/res/drawable/course_ctgp.jpg differ
diff --git a/app/src/main/res/drawable/course_dc.jpg b/app/src/main/res/drawable/course_dc.jpg
new file mode 100644
index 0000000..42d18e1
Binary files /dev/null and b/app/src/main/res/drawable/course_dc.jpg differ
diff --git a/app/src/main/res/drawable/course_ddr.jpg b/app/src/main/res/drawable/course_ddr.jpg
new file mode 100644
index 0000000..1953ba5
Binary files /dev/null and b/app/src/main/res/drawable/course_ddr.jpg differ
diff --git a/app/src/main/res/drawable/course_dks.jpg b/app/src/main/res/drawable/course_dks.jpg
new file mode 100644
index 0000000..80fb78c
Binary files /dev/null and b/app/src/main/res/drawable/course_dks.jpg differ
diff --git a/app/src/main/res/drawable/course_gv.jpg b/app/src/main/res/drawable/course_gv.jpg
new file mode 100644
index 0000000..88f4f35
Binary files /dev/null and b/app/src/main/res/drawable/course_gv.jpg differ
diff --git a/app/src/main/res/drawable/course_kc.jpg b/app/src/main/res/drawable/course_kc.jpg
new file mode 100644
index 0000000..3081fe4
Binary files /dev/null and b/app/src/main/res/drawable/course_kc.jpg differ
diff --git a/app/src/main/res/drawable/course_lc.jpg b/app/src/main/res/drawable/course_lc.jpg
new file mode 100644
index 0000000..531374f
Binary files /dev/null and b/app/src/main/res/drawable/course_lc.jpg differ
diff --git a/app/src/main/res/drawable/course_mc.jpg b/app/src/main/res/drawable/course_mc.jpg
new file mode 100644
index 0000000..4063a33
Binary files /dev/null and b/app/src/main/res/drawable/course_mc.jpg differ
diff --git a/app/src/main/res/drawable/course_mg.jpg b/app/src/main/res/drawable/course_mg.jpg
new file mode 100644
index 0000000..17d00c2
Binary files /dev/null and b/app/src/main/res/drawable/course_mg.jpg differ
diff --git a/app/src/main/res/drawable/course_mh.jpg b/app/src/main/res/drawable/course_mh.jpg
new file mode 100644
index 0000000..93cb7a3
Binary files /dev/null and b/app/src/main/res/drawable/course_mh.jpg differ
diff --git a/app/src/main/res/drawable/course_mmm.jpg b/app/src/main/res/drawable/course_mmm.jpg
new file mode 100644
index 0000000..1c30488
Binary files /dev/null and b/app/src/main/res/drawable/course_mmm.jpg differ
diff --git a/app/src/main/res/drawable/course_mt.jpg b/app/src/main/res/drawable/course_mt.jpg
new file mode 100644
index 0000000..edf7e62
Binary files /dev/null and b/app/src/main/res/drawable/course_mt.jpg differ
diff --git a/app/src/main/res/drawable/course_rbc.jpg b/app/src/main/res/drawable/course_rbc.jpg
new file mode 100644
index 0000000..abc04a7
Binary files /dev/null and b/app/src/main/res/drawable/course_rbc.jpg differ
diff --git a/app/src/main/res/drawable/course_rbc3.jpg b/app/src/main/res/drawable/course_rbc3.jpg
new file mode 100644
index 0000000..f252593
Binary files /dev/null and b/app/src/main/res/drawable/course_rbc3.jpg differ
diff --git a/app/src/main/res/drawable/course_rdh.jpg b/app/src/main/res/drawable/course_rdh.jpg
new file mode 100644
index 0000000..8339c8a
Binary files /dev/null and b/app/src/main/res/drawable/course_rdh.jpg differ
diff --git a/app/src/main/res/drawable/course_rdkjp.jpg b/app/src/main/res/drawable/course_rdkjp.jpg
new file mode 100644
index 0000000..a397916
Binary files /dev/null and b/app/src/main/res/drawable/course_rdkjp.jpg differ
diff --git a/app/src/main/res/drawable/course_rdkm.jpg b/app/src/main/res/drawable/course_rdkm.jpg
new file mode 100644
index 0000000..491089f
Binary files /dev/null and b/app/src/main/res/drawable/course_rdkm.jpg differ
diff --git a/app/src/main/res/drawable/course_rds.jpg b/app/src/main/res/drawable/course_rds.jpg
new file mode 100644
index 0000000..4c3a617
Binary files /dev/null and b/app/src/main/res/drawable/course_rds.jpg differ
diff --git a/app/src/main/res/drawable/course_rgv2.jpg b/app/src/main/res/drawable/course_rgv2.jpg
new file mode 100644
index 0000000..2a6ffd4
Binary files /dev/null and b/app/src/main/res/drawable/course_rgv2.jpg differ
diff --git a/app/src/main/res/drawable/course_rmc.jpg b/app/src/main/res/drawable/course_rmc.jpg
new file mode 100644
index 0000000..49a765f
Binary files /dev/null and b/app/src/main/res/drawable/course_rmc.jpg differ
diff --git a/app/src/main/res/drawable/course_rmc3.jpg b/app/src/main/res/drawable/course_rmc3.jpg
new file mode 100644
index 0000000..184a29d
Binary files /dev/null and b/app/src/main/res/drawable/course_rmc3.jpg differ
diff --git a/app/src/main/res/drawable/course_rmr.jpg b/app/src/main/res/drawable/course_rmr.jpg
new file mode 100644
index 0000000..963be2c
Binary files /dev/null and b/app/src/main/res/drawable/course_rmr.jpg differ
diff --git a/app/src/main/res/drawable/course_rpb.jpg b/app/src/main/res/drawable/course_rpb.jpg
new file mode 100644
index 0000000..ccfc66d
Binary files /dev/null and b/app/src/main/res/drawable/course_rpb.jpg differ
diff --git a/app/src/main/res/drawable/course_rpg.jpg b/app/src/main/res/drawable/course_rpg.jpg
new file mode 100644
index 0000000..917e0a2
Binary files /dev/null and b/app/src/main/res/drawable/course_rpg.jpg differ
diff --git a/app/src/main/res/drawable/course_rr.jpg b/app/src/main/res/drawable/course_rr.jpg
new file mode 100644
index 0000000..320c626
Binary files /dev/null and b/app/src/main/res/drawable/course_rr.jpg differ
diff --git a/app/src/main/res/drawable/course_rsgb.jpg b/app/src/main/res/drawable/course_rsgb.jpg
new file mode 100644
index 0000000..b592868
Binary files /dev/null and b/app/src/main/res/drawable/course_rsgb.jpg differ
diff --git a/app/src/main/res/drawable/course_rsl.jpg b/app/src/main/res/drawable/course_rsl.jpg
new file mode 100644
index 0000000..7423f41
Binary files /dev/null and b/app/src/main/res/drawable/course_rsl.jpg differ
diff --git a/app/src/main/res/drawable/course_rws.jpg b/app/src/main/res/drawable/course_rws.jpg
new file mode 100644
index 0000000..c9de409
Binary files /dev/null and b/app/src/main/res/drawable/course_rws.jpg differ
diff --git a/app/src/main/res/drawable/course_ryf.jpg b/app/src/main/res/drawable/course_ryf.jpg
new file mode 100644
index 0000000..e963059
Binary files /dev/null and b/app/src/main/res/drawable/course_ryf.jpg differ
diff --git a/app/src/main/res/drawable/course_tf.jpg b/app/src/main/res/drawable/course_tf.jpg
new file mode 100644
index 0000000..3379695
Binary files /dev/null and b/app/src/main/res/drawable/course_tf.jpg differ
diff --git a/app/src/main/res/drawable/course_wgm.jpg b/app/src/main/res/drawable/course_wgm.jpg
new file mode 100644
index 0000000..09dbf26
Binary files /dev/null and b/app/src/main/res/drawable/course_wgm.jpg differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bf5adcd..863ff0c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,6 +31,28 @@
app:title="Wiimmfi Watcher"
app:titleTextColor="@color/white" />
+
+
+
+
+
+
+
+
+
-
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
+ app:expandedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Expanded"
+ app:collapsedTitleTextAppearance="@style/TextAppearance.App.CollapsingToolbar.Collapsed">
+
+
+
+
+
+
+
+
+
+
@@ -51,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
- android:theme="@style/Theme.WiimmfiWatcher"
+ android:theme="@style/Theme.WiimmfiWatcher.Watching"
app:headerLayout="@layout/header_navigation_drawer"
app:menu="@menu/drawer_navigation_menu">
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d028cf7..1e230ce 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,4 +13,28 @@
- ?attr/colorPrimaryVariant
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05fc69e..d62aed7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
Watch
Watching %1$s
Enter a friend code to watch
+ Enter the name of a Mii to watch
Recently watched friend codes:
Version
You are running Wiimmfi Watcher version %1$s. You can view the release notes for this version here.]]>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 73a1e00..68da004 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,8 +10,32 @@
- @color/blue_200
- @color/blue_200
- @color/white
+ - false
- ?attr/colorPrimaryVariant
+
+
+
+
+
+
+
\ No newline at end of file