diff options
author | Bryson Steck <steck.bryson@gmail.com> | 2021-05-30 16:53:09 -0600 |
---|---|---|
committer | Bryson Steck <steck.bryson@gmail.com> | 2021-05-30 16:53:09 -0600 |
commit | 1ed362fdcac42fd2c18d1b580c8e20196564ba47 (patch) | |
tree | be3891c2d1a6c7308e2a7f8b4c95251c4a230754 /app | |
parent | 72da66ee0a0c4458f779581245d9ee3d9500f4cb (diff) | |
download | wiimmfi-watcher-1ed362fdcac42fd2c18d1b580c8e20196564ba47.tar wiimmfi-watcher-1ed362fdcac42fd2c18d1b580c8e20196564ba47.tar.gz wiimmfi-watcher-1ed362fdcac42fd2c18d1b580c8e20196564ba47.tar.bz2 |
fixed about fragment license text error, added margins to watchcodesfragment
Diffstat (limited to 'app')
-rw-r--r-- | app/build.gradle | 4 | ||||
-rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java | 3 | ||||
-rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java | 7 | ||||
-rw-r--r-- | app/src/main/res/layout/room_fragment.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/watch_code_fragment.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 22 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle index d0d4a21..20b68a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "me.brysonsteck.wiimmfiwatcher" minSdkVersion 19 targetSdkVersion 30 - versionCode 4 - versionName "1.1.2" + versionCode 5 + versionName "1.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java index e2c97db..7247e58 100644 --- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java +++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/MainActivity.java @@ -3,6 +3,8 @@ package me.brysonsteck.wiimmfiwatcher; import android.os.Build; import android.os.Bundle; import android.view.View; +import android.view.ViewGroup; +import android.view.WindowManager; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; @@ -18,6 +20,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); View aboutButton = findViewById(R.id.about_button); if (savedInstanceState == null) { diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java index 1b285b9..a14e6f7 100644 --- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java +++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/WatchCodeFragment.java @@ -12,6 +12,9 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.view.OnApplyWindowInsetsListener; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; import androidx.databinding.ObservableList; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -77,7 +80,7 @@ public class WatchCodeFragment extends Fragment { @Override public void onItemRangeInserted(ObservableList<FriendCode> sender, int positionStart, int itemCount) { getActivity().runOnUiThread(() -> { - adapter.notifyItemRangeInserted(positionStart, itemCount); + adapter.notifyItemRangeInserted(positionStart, itemCount); // this is the only method that seems to be called }); } @@ -101,8 +104,8 @@ public class WatchCodeFragment extends Fragment { linearLayoutManager.setStackFromEnd(true); recyclerView.setLayoutManager(linearLayoutManager); recyclerView.setAdapter(adapter); - EditText friendCode = view.findViewById(R.id.friend_code_edit_text); + EditText friendCode = view.findViewById(R.id.friend_code_edit_text); MaterialTextView errorText = view.findViewById(R.id.error_text); Button watchButton = view.findViewById(R.id.watch_button); watchButton.setOnClickListener(buttonClick -> { diff --git a/app/src/main/res/layout/room_fragment.xml b/app/src/main/res/layout/room_fragment.xml index 81f8419..bf49aa1 100644 --- a/app/src/main/res/layout/room_fragment.xml +++ b/app/src/main/res/layout/room_fragment.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <androidx.constraintlayout.widget.ConstraintLayout 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" - android:foregroundTint="@color/white"> + android:foregroundTint="@color/white" + + > <TextView android:id="@+id/room_header_text" @@ -20,7 +21,8 @@ android:layout_width="match_parent" android:layout_height="0dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/room_header_text" > + app:layout_constraintTop_toBottomOf="@+id/room_header_text" + android:fitsSystemWindows="true"> </androidx.recyclerview.widget.RecyclerView> diff --git a/app/src/main/res/layout/watch_code_fragment.xml b/app/src/main/res/layout/watch_code_fragment.xml index 7bfe60a..ab93298 100644 --- a/app/src/main/res/layout/watch_code_fragment.xml +++ b/app/src/main/res/layout/watch_code_fragment.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout 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:id="@+id/watch_code_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="15dp"> + android:padding="15dp" + android:focusable="true" android:focusableInTouchMode="true"> <ProgressBar android:id="@+id/progressBar1" style="?android:attr/progressBarStyleLarge" @@ -56,12 +56,14 @@ <ScrollView android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_marginBottom="?android:attr/actionBarSize"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginBottom="?android:attr/actionBarSize"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/recent_friend_codes_recycler_view" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 58d861b..e254585 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ <string name="about_watcher">Wiimmfi Watcher is an UNOFFICIAL application created for a school project that I have decided to turn into a full application. This application was made to provide an easy shortcut to the Wiimmfi website and display data in a mobile friendly way, since the official website doesn\'t have a mobile friendly version. Free and open source, you can watch your Wiimmfi matches on your phone in a quick and easy way. </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 <a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE'>GNU General Public License</a> (Version 3).</string> <string name="bugs">Speaking of bugs, did you find a bug? Do you want to provide feedback on the app? I\'d love to hear it! 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> - <string name="license">© Copyright 2021 Bryson Steck Wiimmfi Watcher is available under the GNU General Public License Version 3. You can view the license <a href="https://github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE">here.</a> Wiimmfi Watcher is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Wiimmfi Watcher is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wiimmfi Watcher. If not, see <<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>>.</string> + <string name="license">© Copyright 2021 Bryson Steck\n\nWiimmfi Watcher is available under the GNU General Public License Version 3. You can view the license <a href="https://github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE">here.</a>\n\nWiimmfi Watcher is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nWiimmfi Watcher is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Wiimmfi Watcher. If not, see <<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>>.</string> <string name="contact">If you would like to get a hold of me for any reason unrelated to bug reports or this app in general, you can contact me through email at <a href='mailto:steck.bryson@gmail.com'>steck.bryson@gmail.com</a> or on Discord at bryzinga#9971.</string> <string name="watch">Watch</string> |