diff options
author | Bryson Steck <steck.bryson@gmail.com> | 2021-05-09 00:44:42 -0600 |
---|---|---|
committer | Bryson Steck <steck.bryson@gmail.com> | 2021-05-09 00:44:42 -0600 |
commit | 2734f6777a6b7c439d9bc55c8756155721f76fa5 (patch) | |
tree | ca830b6dab31abef50e49b1c96698d5b127b5c5c /app/src/main/res | |
parent | 5c0ed1708a3f23fcb78cfe8442487a403674c56a (diff) | |
download | wiimmfi-watcher-2734f6777a6b7c439d9bc55c8756155721f76fa5.tar wiimmfi-watcher-2734f6777a6b7c439d9bc55c8756155721f76fa5.tar.gz wiimmfi-watcher-2734f6777a6b7c439d9bc55c8756155721f76fa5.tar.bz2 |
added clear button but doesn't work yet
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/drawable/ic_baseline_clear_all_24.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/layout/about_fragment.xml | 221 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_main.xml | 15 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
4 files changed, 149 insertions, 94 deletions
diff --git a/app/src/main/res/drawable/ic_baseline_clear_all_24.xml b/app/src/main/res/drawable/ic_baseline_clear_all_24.xml new file mode 100644 index 0000000..54ca983 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_clear_all_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#FFFFFF" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z"/> +</vector> diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml index 623b71f..ce55068 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -1,110 +1,143 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView - android:id="@+id/textView" - android:layout_width="0dp" + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="About Wiimmfi Watcher" - android:textSize="30sp" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:padding="15dp" + android:paddingBottom="30dp"> - <TextView - android:id="@+id/about_watcher_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="TextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView" /> + <TextView + android:id="@+id/textView" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="About Wiimmfi Watcher" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/textView5" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="About Me" - android:textSize="30sp" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/about_watcher_text" /> + <TextView + android:id="@+id/about_watcher_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingBottom="15dp" + android:text="TextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView" /> - <TextView - android:id="@+id/about_me_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="TextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView5" /> + <TextView + android:id="@+id/textView5" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="About Me" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/about_watcher_text" /> - <TextView - android:id="@+id/textView7" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="GitHub" - android:textSize="30sp" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/about_me_text" /> + <TextView + android:id="@+id/about_me_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="TextView" + android:paddingBottom="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView5" /> - <TextView - android:id="@+id/github_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="TextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView7" /> + <TextView + android:id="@+id/textView7" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="GitHub" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/about_me_text" /> - <TextView - android:id="@+id/textView8" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="Donations" - android:textSize="30sp" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/github_text" /> + <TextView + android:id="@+id/github_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="TextView" + android:paddingBottom="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView7" /> - <TextView - android:id="@+id/donations_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="TextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView8" /> + <TextView + android:id="@+id/textView8" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="Donations" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/github_text" /> - <TextView - android:id="@+id/textView9" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="Contact" - android:textSize="30sp" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/donations_text" /> + <TextView + android:id="@+id/donations_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="TextView" + android:paddingBottom="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView8" /> - <TextView - android:id="@+id/contact_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="TextView" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView9" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file + <TextView + android:id="@+id/textView9" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="Contact" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/donations_text" /> + + <TextView + android:id="@+id/contact_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="TextView" + android:paddingBottom="15dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView9" /> + + <TextView + android:id="@+id/bugs_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingBottom="65dp" + android:text="TextView" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView13" /> + + <TextView + android:id="@+id/textView13" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="Bugs?" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/contact_text" /> + </androidx.constraintlayout.widget.ConstraintLayout> + </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 109efae..1e15f02 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -44,6 +44,21 @@ 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" /> + <!-- Screen content --> <!-- Use app:layout_behavior="@string/appbar_scrolling_view_behavior" to fit below top app bar --> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 276e54a..88268f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +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> </resources>
\ No newline at end of file |