diff options
author | Bryson Steck <steck.bryson@gmail.com> | 2021-08-15 21:16:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-15 21:16:30 -0500 |
commit | f6438b7cd9a8e2091971ae65892e3ff10d89a572 (patch) | |
tree | a017f78b65b01b87519ff29d17b5f61cd9701d74 /app/src/main/java | |
parent | 1643931494c2b9411a05fdefe8c03416fe072142 (diff) | |
parent | b4078fe23a7cbae5eb2a017663c5b46990defcb7 (diff) | |
download | wiimmfi-watcher-f6438b7cd9a8e2091971ae65892e3ff10d89a572.tar wiimmfi-watcher-f6438b7cd9a8e2091971ae65892e3ff10d89a572.tar.gz wiimmfi-watcher-f6438b7cd9a8e2091971ae65892e3ff10d89a572.tar.bz2 |
Merge pull request #1 from brysonsteck/detour
adding pictures instead
Diffstat (limited to 'app/src/main/java')
-rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java | 33 | ||||
-rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/fragments/WatchCodeFragment.java | 7 |
2 files changed, 38 insertions, 2 deletions
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( |