luca0N
/
Pluck
1
1
Fork 0
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'Add network notice' (#20) from dev into master 

Reviewed-on: https://git.luca0N.com/luca0N/Pluck/pulls/20
This commit is contained in:
luca0N! 2021-03-17 19:53:27 +00:00
parent 695bd1b1a7 a5cb9430a1
commit a6ae301c39
Signed by: luca0N! Git
GPG Key ID: 916186E0CBD7AB60
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/activity_main.xml
View File

@ -94,6 +94,11 @@ Contact us at <joguitos+pluck@luca0n.com>.
android:text="@string/ui_start_game" android:text="@string/ui_start_game"
android:textSize="24sp" /> android:textSize="24sp" />
<TextView
android:text="@string/ui_network_notice"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

1
app/src/main/res/values/strings.xml
View File

@ -91,6 +91,7 @@ Contact us at <joguitos+pluck@luca0n.com>.
<string name="ui_return_to_menu">Return To Menu</string> <string name="ui_return_to_menu">Return To Menu</string>
<string name="ui_source">Source</string> <string name="ui_source">Source</string>
<string name="ui_source_about">This value specifies where the game should retrieve trivia data. By default, the game gathers trivia data from a server, but you can load trivia files with the "File" source option.</string> <string name="ui_source_about">This value specifies where the game should retrieve trivia data. By default, the game gathers trivia data from a server, but you can load trivia files with the "File" source option.</string>
<string name="ui_network_notice">Notice: when using a server as the game source, this game connects to Open Trivia Database by default to gather trivia questions. Open Trivia Database is a collection of user-contributed questions that are licensed under the Creative Commons Attribution-ShareAlike 4.0 International (CC-BY-SA 4.0) license.\n\nYou can select a custom server in the game settings.\n\nIf you want to open a trivia file instead of getting trivia questions from a server, select "File" as the trivia game source above.</string>
<!-- Error Strings --> <!-- Error Strings -->
<string name="error">Error</string> <string name="error">Error</string>