aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/ic_watcher_icons-playstore.pngbin0 -> 252507 bytes
-rw-r--r--app/src/main/java/me/brysonsteck/wiimmfiwatcher/AboutFragment.java43
-rw-r--r--app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java32
-rw-r--r--app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java5
-rw-r--r--app/src/main/res/drawable/ic_watcher_icons_background.xml74
-rw-r--r--app/src/main/res/layout/activity_main.xml28
-rw-r--r--app/src/main/res/layout/friend_code_input_fragment.xml9
-rw-r--r--app/src/main/res/menu/top_app_bar.xml1
-rw-r--r--app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons.xml5
-rw-r--r--app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons_round.xml5
-rw-r--r--app/src/main/res/mipmap-hdpi/ic_watcher_icons.pngbin0 -> 9397 bytes
-rw-r--r--app/src/main/res/mipmap-hdpi/ic_watcher_icons_foreground.pngbin0 -> 25746 bytes
-rw-r--r--app/src/main/res/mipmap-hdpi/ic_watcher_icons_round.pngbin0 -> 11576 bytes
-rw-r--r--app/src/main/res/mipmap-mdpi/ic_watcher_icons.pngbin0 -> 4810 bytes
-rw-r--r--app/src/main/res/mipmap-mdpi/ic_watcher_icons_foreground.pngbin0 -> 12898 bytes
-rw-r--r--app/src/main/res/mipmap-mdpi/ic_watcher_icons_round.pngbin0 -> 5739 bytes
-rw-r--r--app/src/main/res/mipmap-xhdpi/ic_watcher_icons.pngbin0 -> 15572 bytes
-rw-r--r--app/src/main/res/mipmap-xhdpi/ic_watcher_icons_foreground.pngbin0 -> 40827 bytes
-rw-r--r--app/src/main/res/mipmap-xhdpi/ic_watcher_icons_round.pngbin0 -> 19167 bytes
-rw-r--r--app/src/main/res/mipmap-xxhdpi/ic_watcher_icons.pngbin0 -> 29933 bytes
-rw-r--r--app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_foreground.pngbin0 -> 76061 bytes
-rw-r--r--app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_round.pngbin0 -> 37321 bytes
-rw-r--r--app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons.pngbin0 -> 47579 bytes
-rw-r--r--app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_foreground.pngbin0 -> 114545 bytes
-rw-r--r--app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_round.pngbin0 -> 59568 bytes
-rw-r--r--app/src/main/res/values-night/themes.xml4
-rw-r--r--app/src/main/res/values/colors.xml3
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/values/themes.xml4
30 files changed, 165 insertions, 54 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aaf7fd9..bae710f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,9 +6,9 @@
<application
android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@mipmap/ic_watcher_icons"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
+ android:roundIcon="@mipmap/ic_watcher_icons_round"
android:supportsRtl="true"
android:theme="@style/Theme.WiimmfiWatcher">
<activity android:name=".MainActivity">
diff --git a/app/src/main/ic_watcher_icons-playstore.png b/app/src/main/ic_watcher_icons-playstore.png
new file mode 100644
index 0000000..b06bb01
--- /dev/null
+++ b/app/src/main/ic_watcher_icons-playstore.png
Binary files differ
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/AboutFragment.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/AboutFragment.java
index 4cd51fd..c74c8c5 100644
--- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/AboutFragment.java
+++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/AboutFragment.java
@@ -11,14 +11,25 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+import com.google.android.material.appbar.MaterialToolbar;
+
public class AboutFragment extends Fragment {
- public AboutFragment() { super(R.layout.about_fragment); }
+ View aboutButton;
+ MaterialToolbar toolbar;
+
+ public AboutFragment() {
+ super(R.layout.about_fragment);
+ }
@SuppressLint("SetTextI18n")
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
+ aboutButton = getActivity().findViewById(R.id.about_button);
+ toolbar = getActivity().findViewById(R.id.toolbar);
+ toolbar.setTitle("About Wiimmfi Watcher");
+
TextView aboutWatcher = view.findViewById(R.id.about_watcher_text);
TextView aboutMe = view.findViewById(R.id.about_me_text);
TextView github = view.findViewById(R.id.github_text);
@@ -31,18 +42,15 @@ public class AboutFragment extends Fragment {
"Free and open source, you can watch your Wiimmfi Mario Kart Wii matches on your phone in a quick and easy way. " +
"");
- aboutMe.setText("Hi there! My name is Bryson Steck. I am a student studying Computer Science at Utah State University. This is my first official application that I'm maintaining. " +
+ aboutMe.setText("Hi there! My name is Bryson Steck. I am a student studying Computer Science. This is my first official application that I'm maintaining. " +
"This whole \"application on the Google Play Store\" thing is new to me, so please be patient as I am learning how to maintain something like this. " +
- "I hope you enjoy my first application!");
+ "I hope you enjoy!");
github.setClickable(true);
github.setMovementMethod(LinkMovementMethod.getInstance());
- String githubLink = "<a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master'>here.</a>";
-// github.setText("All of the code in this project is open source on my GitHub repository " + Html.fromHtml(githubLink) + " You are free to use this code and expand upon it under the GNU General Public License.");
github.setText(R.string.github);
-// donations.setMovementMethod(LinkMovementMethod.getInstance());
-// String donationsLink = "<a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master'>here.</a>";
+
donations.setText("Since this application is free and the code is open source, I do not receive income from maintaining this app. Because of that, I'd appreciate any donation in the following methods:\n\n" +
"PayPal: @bryzinga\n" +
"Venmo: @brysonsteck\n" +
@@ -53,12 +61,23 @@ public class AboutFragment extends Fragment {
contact.setText("If you would like to get ahold of me for any reason unrelated to bug reports or this app in general, you can contact me through email at steck.bryson@gmail.com " +
"or on Discord at bryzinga#9971.");
-// String todoList = "<a href='https://github.com/brysonsteck/wiimmfi-watcher/blob/master/TODO.md'>todo list.</a>";
-// String issueGithub = "<a href='https://github.com/brysonsteck/wiimmfi-watcher/issues'>here.</a>";
-// bugs.setText("Speaking of bugs, did you find a bug? First, make sure that the issue you found is not listed on my " + Html.fromHtml(todoList) +
-// "It's possible I'm already aware of it or working on it. If your issue is not addressed on the todo list, then you can create an issue on my GitHub repository " + Html.fromHtml(issueGithub) +
-// "If you aren't sure how to use GitHub, you can also fill out this Google Forum.");
+ bugs.setClickable(true);
+ bugs.setMovementMethod(LinkMovementMethod.getInstance());
+
bugs.setText(R.string.bugs);
}
+ @Override
+ public void onStop() {
+ super.onStop();
+ aboutButton.setVisibility(View.VISIBLE);
+ toolbar.setTitle("Wiimmfi Watcher");
+ }
+ @Override
+ public void onResume() {
+ super.onResume();
+ aboutButton.setVisibility(View.INVISIBLE);
+ toolbar.setTitle("About Wiimmfi Watcher");
+ }
+
}
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
index c3933ee..d935d48 100644
--- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
+++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java
@@ -24,8 +24,12 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+
+ View aboutButton = findViewById(R.id.about_button);
if (savedInstanceState == null) {
+ aboutButton.setVisibility(View.VISIBLE);
getSupportFragmentManager().beginTransaction()
.replace(R.id.friend_code_input_fragment, new WatchCodeFragment(), null)
.setReorderingAllowed(true)
@@ -33,25 +37,25 @@ public class MainActivity extends AppCompatActivity {
}
- setContentView(R.layout.activity_main);
database = Room.databaseBuilder(this, AppDatabase.class, "friend-codes-db").build();
- View aboutButton = findViewById(R.id.about_button);
- ExtendedFloatingActionButton clearButton = findViewById(R.id.clear_button);
- FriendCodeViewModel viewModel = new ViewModelProvider(MainActivity.this).get(FriendCodeViewModel.class);
- clearButton.setOnClickListener(new View.OnClickListener() {
-
- @Override
- public void onClick(View view) {
- new Thread(() -> {
- database.clearAllTables();
- database.query(new SimpleSQLiteQuery("DELETE FROM friendcode"));
- });
- }
- });
+// aboutButton.setVisibility(View.INVISIBLE);
+// ExtendedFloatingActionButton clearButton = findViewById(R.id.clear_button);
+ FriendCodeViewModel viewModel = new ViewModelProvider(MainActivity.this).get(FriendCodeViewModel.class);
+// clearButton.setOnClickListener(new View.OnClickListener() {
+//
+//
+// @Override
+// public void onClick(View view) {
+// getApplicationContext().deleteDatabase("friend-codes-db");
+// database = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "friend-codes-db").build();
+// }
+// });
aboutButton.setOnClickListener((about) -> {
+// aboutButton.setClickable(false);
+ aboutButton.setVisibility(View.INVISIBLE);
getSupportFragmentManager().beginTransaction()
.replace(R.id.friend_code_input_fragment, new AboutFragment(), null)
.setReorderingAllowed(true)
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java
index 414519c..465cccf 100644
--- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java
+++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java
@@ -84,7 +84,10 @@ public class WatchCodeFragment extends Fragment {
}
});
RecyclerView recyclerView = view.findViewById(R.id.recent_friend_codes_recycler_view);
- recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+ LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
+ linearLayoutManager.setReverseLayout(true);
+ linearLayoutManager.setStackFromEnd(true);
+ recyclerView.setLayoutManager(linearLayoutManager);
recyclerView.setAdapter(adapter);
Button watchButton = view.findViewById(R.id.watch_button);
EditText friendCode = view.findViewById(R.id.friend_code_edit_text);
diff --git a/app/src/main/res/drawable/ic_watcher_icons_background.xml b/app/src/main/res/drawable/ic_watcher_icons_background.xml
new file mode 100644
index 0000000..ca3826a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_watcher_icons_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+ android:height="108dp"
+ android:width="108dp"
+ android:viewportHeight="108"
+ android:viewportWidth="108"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#3DDC84"
+ android:pathData="M0,0h108v108h-108z"/>
+ <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+ <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+ android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1e15f02..1116b4b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -44,20 +44,20 @@
android:hapticFeedbackEnabled="false"
app:layout_constraintTop_toBottomOf="@+id/friend_code_input_fragment" />
- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
- android:id="@+id/clear_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|right"
- android:layout_margin="15dp"
- android:foregroundTint="#FFFFFF"
- android:text="Clear"
- android:textColor="#FFFFFF"
- app:backgroundTint="#1E88E5"
- app:icon="@drawable/ic_baseline_clear_all_24"
- app:iconTint="#FFFFFF"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+<!-- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton-->
+<!-- android:id="@+id/clear_button"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:layout_gravity="bottom|right"-->
+<!-- android:layout_margin="15dp"-->
+<!-- android:foregroundTint="#FFFFFF"-->
+<!-- android:text="Clear"-->
+<!-- android:textColor="#FFFFFF"-->
+<!-- app:backgroundTint="#1E88E5"-->
+<!-- app:icon="@drawable/ic_baseline_clear_all_24"-->
+<!-- app:iconTint="#FFFFFF"-->
+<!-- app:layout_constraintBottom_toBottomOf="parent"-->
+<!-- app:layout_constraintEnd_toEndOf="parent" />-->
<!-- Screen content -->
<!-- Use app:layout_behavior="@string/appbar_scrolling_view_behavior" to fit below top app bar -->
diff --git a/app/src/main/res/layout/friend_code_input_fragment.xml b/app/src/main/res/layout/friend_code_input_fragment.xml
index 4421a65..0dcf568 100644
--- a/app/src/main/res/layout/friend_code_input_fragment.xml
+++ b/app/src/main/res/layout/friend_code_input_fragment.xml
@@ -56,9 +56,10 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recent_friend_codes_recycler_view"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/textView3"
- tools:layout_editor_absoluteX="15dp" />
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textView3" />
</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/menu/top_app_bar.xml b/app/src/main/res/menu/top_app_bar.xml
index 845eaf4..0b2e0aa 100644
--- a/app/src/main/res/menu/top_app_bar.xml
+++ b/app/src/main/res/menu/top_app_bar.xml
@@ -5,6 +5,7 @@
android:id="@+id/about_button"
android:icon="@drawable/ic_baseline_info_24"
android:title="About"
+ android:visible="true"
app:showAsAction="ifRoom" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons.xml b/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons.xml
new file mode 100644
index 0000000..e813a3f
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_watcher_icons_background"/>
+ <foreground android:drawable="@mipmap/ic_watcher_icons_foreground"/>
+</adaptive-icon> \ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons_round.xml
new file mode 100644
index 0000000..e813a3f
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_watcher_icons_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_watcher_icons_background"/>
+ <foreground android:drawable="@mipmap/ic_watcher_icons_foreground"/>
+</adaptive-icon> \ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_watcher_icons.png b/app/src/main/res/mipmap-hdpi/ic_watcher_icons.png
new file mode 100644
index 0000000..155a208
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_watcher_icons.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_watcher_icons_foreground.png b/app/src/main/res/mipmap-hdpi/ic_watcher_icons_foreground.png
new file mode 100644
index 0000000..fe9360c
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_watcher_icons_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_watcher_icons_round.png b/app/src/main/res/mipmap-hdpi/ic_watcher_icons_round.png
new file mode 100644
index 0000000..5530efc
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/ic_watcher_icons_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_watcher_icons.png b/app/src/main/res/mipmap-mdpi/ic_watcher_icons.png
new file mode 100644
index 0000000..f7fd03e
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_watcher_icons.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_watcher_icons_foreground.png b/app/src/main/res/mipmap-mdpi/ic_watcher_icons_foreground.png
new file mode 100644
index 0000000..605df09
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_watcher_icons_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_watcher_icons_round.png b/app/src/main/res/mipmap-mdpi/ic_watcher_icons_round.png
new file mode 100644
index 0000000..4161cb8
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/ic_watcher_icons_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_watcher_icons.png b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons.png
new file mode 100644
index 0000000..9d7811c
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_foreground.png
new file mode 100644
index 0000000..6c156f7
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_round.png b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_round.png
new file mode 100644
index 0000000..6693089
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/ic_watcher_icons_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons.png b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons.png
new file mode 100644
index 0000000..1bafe3a
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_foreground.png
new file mode 100644
index 0000000..074ca58
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_round.png b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_round.png
new file mode 100644
index 0000000..da6a227
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/ic_watcher_icons_round.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons.png b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons.png
new file mode 100644
index 0000000..2e04328
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_foreground.png
new file mode 100644
index 0000000..329a488
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_foreground.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_round.png
new file mode 100644
index 0000000..4752fc7
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_watcher_icons_round.png
Binary files differ
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 359a761..efb6bec 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -6,8 +6,8 @@
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/black</item>
<!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_200</item>
+ <item name="colorSecondary">@color/blue_200</item>
+ <item name="colorSecondaryVariant">@color/blue_200</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e3b20f7..f508026 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,8 +3,7 @@
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
- <color name="teal_200">#FF03DAC5</color>
- <color name="teal_700">#FF018786</color>
+ <color name="blue_200">#42A5F5</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="blue_700">#1E88E5</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88268f7..2a6f8a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Wiimmfi</string>
<string name="github">All of the code in this project is open source on my GitHub repository <a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master'>here.</a> You are free to use this code and expand upon it under the GNU General Public License.</string>
- <string name="bugs">Speaking of bugs, did you find a bug? First, make sure that the issue you found is not listed on my <a href='https://github.com/brysonsteck/wiimmfi-watcher/blob/master/TODO.md'>todo list.</a> It\'s possible I\'m already aware of it or working on it. If your issue is not addressed on the todo list, then you can create an issue on my GitHub repository <a href='https://github.com/brysonsteck/wiimmfi-watcher/issues'>here.</a> If you aren\'t sure how to use GitHub, you can also fill out this Google Forum.</string>
+ <string name="bugs">Speaking of bugs, did you find a bug? First, make sure that the issue you found is not listed on my <a href='https://github.com/brysonsteck/wiimmfi-watcher/blob/master/TODO.md'>todo list.</a> It\'s possible I\'m already aware of it or working on it. If your issue is not addressed on the todo list, then you can create an issue on my GitHub repository <a href='https://github.com/brysonsteck/wiimmfi-watcher/issues'>here.</a> If you don\'t know how to use GitHub, you can fill out this <a href='https://docs.google.com/forms/d/e/1FAIpQLSd6qCONAP2tsbHPgzu_CdZcHVHL5nx7q0XFqrVfExEc84kqUQ/viewform?usp=sf_link'>Google Form</a> instead.</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 48628ef..b166e7b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,8 +6,8 @@
<item name="colorPrimaryVariant">#0D47A1</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
- <item name="colorSecondary">@color/teal_200</item>
- <item name="colorSecondaryVariant">@color/teal_700</item>
+ <item name="colorSecondary">@color/blue_200</item>
+ <item name="colorSecondaryVariant">@color/blue_200</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>