diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/RoomFragment.java | 13 | ||||
| -rw-r--r-- | app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/WiimmfiActivity.java | 18 | ||||
| -rw-r--r-- | app/src/main/res/values-de/strings.xml (renamed from app/src/main/res/values-de-rDE/strings.xml) | 1 | ||||
| -rw-r--r-- | app/src/main/res/values-it/strings.xml | 32 | ||||
| -rw-r--r-- | app/src/main/res/values-ja/strings.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
6 files changed, 82 insertions, 14 deletions
diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/RoomFragment.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/RoomFragment.java index 4f5b1bc..f22bf1c 100644 --- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/RoomFragment.java +++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/RoomFragment.java @@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.net.UnknownHostException; @@ -26,8 +27,9 @@ public class RoomFragment extends Fragment { String playerLink; ArrayList<Player> players; RoomData roomData; + MaterialToolbar toolbar; - public RoomFragment(String friendCode, ArrayList<Player> players, String playerLink, String display) { + public RoomFragment(String friendCode, ArrayList<Player> players, String playerLink, String display, MaterialToolbar toolbar) { super(R.layout.room_fragment); this.roomData = new RoomData(players, friendCode); new Thread(() -> { @@ -36,7 +38,7 @@ public class RoomFragment extends Fragment { this.display = display; this.players = players; this.playerLink = playerLink; - + this.toolbar = toolbar; } @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { @@ -45,13 +47,15 @@ public class RoomFragment extends Fragment { TextView headerTextView = view.findViewById(R.id.room_header_text); if (header == null) { headerTextView.setText(R.string.header_null_error); + toolbar.setNavigationIcon(null); } if (roomData.error != null) { headerTextView.setText(getResources().getString(R.string.jsoup_error, roomData.error)); - + toolbar.setNavigationIcon(null); } if (roomData.error == null && header != null) { headerTextView.setText(header); + toolbar.setNavigationIcon(R.drawable.ic_baseline_menu_24); } RecyclerView recyclerView = view.findViewById(R.id.player_data_recycler_view); recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); @@ -66,12 +70,15 @@ public class RoomFragment extends Fragment { header = newRoomData.getRoomHeader(); if (header == null) { headerTextView.setText(R.string.header_null_error); + toolbar.setNavigationIcon(null); } if (newRoomData.error instanceof java.net.SocketTimeoutException || newRoomData.error instanceof java.net.UnknownHostException) { headerTextView.setText(R.string.jsoup_error); + toolbar.setNavigationIcon(null); } if (roomData.error == null && header != null) { headerTextView.setText(header); + toolbar.setNavigationIcon(R.drawable.ic_baseline_menu_24); } recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setAdapter(new RoomAdapter(display, playerLink, header, players, getContext())); diff --git a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/WiimmfiActivity.java b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/WiimmfiActivity.java index bb20969..c0d4c9f 100644 --- a/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/WiimmfiActivity.java +++ b/app/src/main/java/me/brysonsteck/wiimmfiwatcher/wiimmfi/WiimmfiActivity.java @@ -5,6 +5,7 @@ import android.content.res.Configuration; import android.graphics.Color; import android.os.Bundle; import android.os.StrictMode; +import android.view.View; import androidx.appcompat.app.AppCompatActivity; import androidx.drawerlayout.widget.DrawerLayout; @@ -33,7 +34,6 @@ public class WiimmfiActivity extends AppCompatActivity { StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build(); StrictMode.setThreadPolicy(policy); - MaterialToolbar toolbar = findViewById(R.id.toolbar); DrawerLayout drawerLayout = findViewById(R.id.drawer_layout); NavigationView drawer = findViewById(R.id.navigation_view); @@ -50,7 +50,7 @@ public class WiimmfiActivity extends AppCompatActivity { if (savedInstanceState == null) { getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "fc"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "fc", toolbar), null) .setReorderingAllowed(true) .commit(); } @@ -63,49 +63,49 @@ public class WiimmfiActivity extends AppCompatActivity { if (menuItem.getItemId() == R.id.friend_code) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "fc"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "fc", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.roles) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "roles"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "roles", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.login_regions) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "login_regions"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "login_regions", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.room_match) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "room_match"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "room_match", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.world) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "world"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "world", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.conn_fail) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "conn_fail"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "conn_fail", toolbar), null) .setReorderingAllowed(true) .commit(); } if (menuItem.getItemId() == R.id.vr_br) { players.clear(); getSupportFragmentManager().beginTransaction() - .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "vr_br"), null) + .replace(R.id.room_fragment, new RoomFragment(friendCode, players, playerLink[0], "vr_br", toolbar), null) .setReorderingAllowed(true) .commit(); } diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de/strings.xml index c5464c6..9d21f1b 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,7 +17,6 @@ <string name="room_match">Zimmer, Streichholz</string> <string name="world">Welt</string> <string name="conn_fail">Verbindung fehlgeschlagen</string> - <string name="vr_br">VR / BR</string> <string name="error_fc_syntax">FEHLER: Geben Sie einen Freundescode im Format XXXX-XXXX-XXXX ein</string> <string name="header_null_error">Dieser Player ist nicht online, befindet sich nicht in einem Raum oder existiert nicht. Klicken Sie auf die Schaltfläche \"Aktualisieren\", um es erneut zu versuchen, oder klicken Sie auf die Schaltfläche \"Zurück\", um einen anderen Freundescode einzugeben.</string> <string name="jsoup_error">Hoppla! Wiimmfi Watcher konnte keine Verbindung zu den Wiimmfi-Servern herstellen. Dies kann sein, dass Sie nicht mit dem Internet verbunden sind, aber es könnte etwas anderes sein. Hier war der Fehler:\n\n%1$s\n\nWenn der Fehler im Sinne von \"Unable to resolve host\" oder \"Timeout\" auftritt, haben Sie wahrscheinlich Internetprobleme. Stellen Sie sicher, dass Sie mit dem Internet verbunden sind, und klicken Sie dann auf die Schaltfläche \"Aktualisieren\" oder drücken Sie zurück, um einen neuen Freundescode anzuzeigen.\n\nWenn der Fehler etwas anderes ist oder wenn der Fehler weiterhin besteht, stellen Sie sicher, dass die Wiimmfi-Website derzeit ausgeführt wird. Andernfalls machen Sie bitte einen Screenshot dieses Bildschirms und senden Sie einen Fehlerbericht, indem Sie auf der Hauptseite auf das Info-Symbol klicken.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml new file mode 100644 index 0000000..da99aab --- /dev/null +++ b/app/src/main/res/values-it/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Wiimmfi</string> + <string name="about_fragment_title">Informazioni su Wiimmfi Watcher</string> + <string name="about_me">Ciao! Il mio nome è Bryson Steck. Sono uno studente che studia informatica. Questa è la mia prima applicazione ufficiale che sto mantenendo. L\'intera \"applicazione sul Google Play Store\" è nuova per me, quindi sii paziente mentre sto imparando a mantenere qualcosa di simile. Spero ti piaccia!</string> + <string name="about_watcher">Wiimmfi Watcher è un\'applicazione NON UFFICIALE creata per un progetto scolastico che ho deciso di trasformare in un\'applicazione completa. Questa applicazione è stata realizzata per fornire un facile collegamento al sito web Wiimmfi e visualizzare i dati in modo mobile friendly, dal momento che il sito ufficiale non ha una versione mobile friendly. Gratuito e open source, puoi guardare le tue partite Wiimmfi sul tuo telefono in modo semplice e veloce.</string> + <string name="github">Tutto il codice di questo progetto è open source nel mio repository GitHub <a href="https://github.com/brysonsteck/wiimmfi-watcher/tree/master"> qui </a>. Puoi usarlo liberamente codice ed espanderlo sotto la <a href="https://github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE">GNU General Public License</a> (Versione 3).</string> + <string name="bugs">A proposito di insetti, hai trovato un bug? Vuoi fornire un feedback sull\'app? Mi piacerebbe sentirlo! Innanzitutto, assicurati che il problema che hai trovato non sia elencato nel mio <a href="https://github.com/brysonsteck/wiimmfi-watcher/blob/master/TODO.md">elenco di cose da fare</a>. possibile che ne sia già consapevole o ci stia lavorando. Se il tuo problema non viene risolto nell\'elenco delle cose da fare, puoi creare un problema nel mio repository GitHub <a href="https://github.com/brysonsteck/wiimmfi-watcher/issues">qui.</a> Se non sai come utilizzare GitHub, puoi compilare questo <a href="https://docs.google.com/forms/d/e/1FAIpQLSd6qCONAP2tsbHPgzu_CdZcHVHL5nx7q0XFqrVfExEc84kqUQ/viewform?usp=sf_link">Google Form</a>invece.</string> + <string name="contact">Se desideri contattarmi per qualsiasi motivo non correlato alle segnalazioni di bug o all\'app in generale, puoi contattarmi tramite e-mail all\'indirizzo <a href="mailto:steck.bryson@gmail.com"> steck.bryson @ gmail.com </a> o su Discord all\'indirizzo bryzinga # 9971.</string> + <string name="license">© Copyright 2021 Bryson Steck\n\nWiimmfi Watcher è disponibile con GNU General Public License Versione 3. Puoi visualizzare la licenza <a href='https: //github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE'>qui.</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="watch">Orologio</string> + <string name="watching">Guardare %1$s</string> + <string name="enter_fc">Inserisci un codice amico per guardare</string> + <string name="recent_fc">Codici amico guardati di recente:</string> + <string name="about_watcher_header">Informazioni su Wiimmfi Watcher</string> + <string name="about_me_header">Su di me</string> + <string name="contact_header">Contatto</string> + <string name="bugs_header">Bug e feedback</string> + <string name="license_header">Licenza e copyright</string> + <string name="player_details">Dettagli del giocatore</string> + <string name="friend_code">Codici amico</string> + <string name="roles">Ruoli</string> + <string name="login_regions">Regioni di accesso</string> + <string name="room_match">Camera, partita</string> + <string name="world">Mondo</string> + <string name="conn_fail">Connessione fallita</string> + <string name="error_fc_syntax">ERRORE: inserisci un codice amico nel formato XXXX-XXXX-XXXX</string> + <string name="header_null_error">Questo giocatore non è online, non è all\'interno di una stanza o non esiste. Fai clic sul pulsante di aggiornamento per riprovare o fai clic sul pulsante Indietro per inserire un codice amico diverso.</string> + <string name="jsoup_error">Ops! Wiimmfi Watcher non è riuscito a connettersi ai server Wiimmfi. Potrebbe essere che non sei connesso a Internet, ma potrebbe essere qualcos\'altro. Ecco l\'errore: %1$s Se l\'errore è sulla falsariga di \"Impossibile risolvere host\" o \"Timeout\", probabilmente si sta avendo problemi di internet. Assicurati di essere connesso a Internet, quindi fai clic sul pulsante di aggiornamento o premi Indietro per guardare un nuovo codice amico. Se l\'errore è diverso da quello o se l\'errore persiste, assicurati che il sito Web di Wiimmfi sia attualmente in esecuzione. Altrimenti, fai uno screenshot di questa schermata e invia una segnalazione di bug facendo clic sull\'icona Informazioni sulla pagina principale.</string> + o su Discord all\'indirizzo bryzinga # 9971. + + </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml new file mode 100644 index 0000000..f04a118 --- /dev/null +++ b/app/src/main/res/values-ja/strings.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Wiimmfi</string> + <string name="about_fragment_title">Wiimmfi Watcherについて</string> + <string name="about_me">こんにちは！ 私の名前はブライソン・ステックです。 私はコンピュータサイエンスを勉強している学生です。 これは私が維持している私の最初の公式アプリケーションです。 この「GooglePlayストアのアプリケーション」全体は私にとって新しいものなので、このようなものを維持する方法を学んでいるので、しばらくお待ちください。 楽しんでいただければ幸いです。</string> + <string name="about_watcher">Wiimmfi Watcherは、私が完全なアプリケーションに変えることにした学校のプロジェクトのために作成された非公式のアプリケーションです。 このアプリケーションは、公式Webサイトにモバイル対応バージョンがないため、Wiimmfi Webサイトへの簡単なショートカットを提供し、モバイル対応の方法でデータを表示するために作成されました。 無料のオープンソースで、Wiimmfiの試合を携帯電話ですばやく簡単に見ることができます。</string> + <string name="watch">見る</string> + <string name="watching">%1$sを見る</string> + <string name="enter_fc">視聴する友達コードを入力してください</string> + <string name="recent_fc">最近見た友達コード：</string> + <string name="about_watcher_header">Wiimmfi Watcherについて</string> + <string name="about_me_header">私について</string> + <string name="contact_header">連絡先</string> + <string name="bugs_header">バグとフィードバック</string> + <string name="license_header">ライセンスと著作権</string> + <string name="player_details">プレーヤーの詳細</string> + <string name="friend_code">フレンドコード</string> + <string name="roles">役割</string> + <string name="login_regions">ログインリージョン</string> + <string name="room_match">部屋、試合</string> + <string name="world">世界</string> + <string name="conn_fail">接続に失敗する</string> + <string name="error_fc_syntax">エラー：XXXX-XXXX-XXXXの形式でフレンドコードを挿入してください</string> + <string name="header_null_error">このプレーヤーはオンラインではないか、部屋の中にいないか、存在しません。 更新ボタンをクリックして再試行するか、戻るボタンをクリックして別のフレンドコードを入力してください。</string> + <string name="jsoup_error">おっと！ Wiimmfi WatcherはWiimmfiサーバーに接続できませんでした。 これは、インターネットに接続していない可能性がありますが、他の何かである可能性があります。 エラーは次のとおりです。</string> + <string name="github">このプロジェクトのすべてのコードは、私のGitHubリポジトリ<a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master'>ここ</a>のオープンソースです。 このコードは自由に使用でき、<a href='https://github.com/brysonsteck/wiimmfi-watcher/tree/master/LICENSE'>（GNU一般公衆ライセンス）</a>（バージョン3）の下で拡張できます。</string> + <string name="bugs">バグといえば、バグを見つけましたか？ アプリに関するフィードバックを提供しますか？ 聞いてみたいです！ まず、見つけた問題が私の<a href='https://github.com/brysonsteck/wiimmfi-watcher/blob/master/TODO.md'>（やることリスト）</a>にリストされていないことを確認してください。 私はすでにそれを知っているか、それに取り組んでいる可能性があります。 To Doリストで問題が解決されていない場合は、GitHubリポジトリ<a href='https://github.com/brysonsteck/wiimmfi-watcher/issues'>（ここ）</a>で問題を作成できます。 GitHubの使用方法がわからない場合は、代わりにこれ<a href='https://docs.google.com/forms/d/e/1FAIpQLSd6qCONAP2tsbHPgzu_CdZcHVHL5nx7q0XFqrVfExEc84kqUQ/viewform?usp=sf_link'>（Googleフォーム）</a>に記入できます。</string> + <string name="license">＆＃169; Copyright 2021 Bryson Steck\n\nWiimmfi Watcherは、GNU一般公衆ライセンスバージョン3で利用できます。ライセンスはここで確認できます（こちら）。\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">バグレポートやこのアプリ全般とは関係のない理由で私を捕まえたい場合は、電子メール<a href='mailto:steck.bryson@gmail.com'>（steck.bryson@gmail.com）</a>またはDiscord（bryzinga＃9971）で私に連絡できます。</string> +</resources>
\ 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 2b72488..b2f95eb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,7 +35,7 @@ <string name="room_match">Room, Match</string> <string name="world">World</string> <string name="conn_fail">Connection Fail</string> - <string name="vr_br">VR / BR</string> + <string name="vr_br" translatable="false">VR / BR</string> <string name="error_fc_syntax">ERROR: Insert a friend code in the format XXXX-XXXX-XXXX</string> |