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

Compare commits

base: luca0N:f32a0a7a4386948e75df582ab4342226c696d7b5
Branches Tags
luca0N:master
luca0N:dev
...
compare: luca0N:7fb4ddb79f52af2e506a4871c87e46b125888d32
Branches Tags
luca0N:dev
luca0N:master

2 commits
f32a0a7a43 ... 7fb4ddb79f

Author SHA1 Message Date
luca0N\!
7fb4ddb79f
Added custom server URL support 
Added custom server URL support, changed spaces to tabs and added/changed some preference summary strings.

Based on #9.
 2021-03-09 23:36:14 -03:00
luca0N\!
23e4b4c19d
Added label to settings activity 
Label added to settings activity and changed spaces to tabs.
 2021-03-09 23:33:03 -03:00
6 changed files with 151 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View file

@ -11,7 +11,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme.Dark">
<activity android:name=".activities.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -26,6 +26,7 @@
android:screenOrientation="fullUser"
android:configChanges="orientation|screenSize"/>
<activity android:name=".settings.SettingsActivity"
android:label="@string/ui_settings"
android:screenOrientation="fullUser"
android:configChanges="orientation|screenSize"/>
</application>

4
app/src/main/java/com/luca0n/joguitos/pluck/settings/SettingsActivity.java
View file

@ -36,10 +36,8 @@ public class SettingsActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
if (actionBar != null)
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setTitle(null);
}
getFragmentManager()
.beginTransaction()

19
app/src/main/java/com/luca0n/joguitos/pluck/trivia/TriviaQuery.java
View file

@ -23,10 +23,16 @@ Contact us at <joguitos+pluck@luca0n.com>.
package com.luca0n.joguitos.pluck.trivia;
import com.luca0n.joguitos.pluck.PluckApplication;
import com.luca0n.joguitos.pluck.R;
import java.io.Serializable;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
public class TriviaQuery implements Serializable {
private static final String BASE = "https://opentdb.com/api.php?";
private static final int DEFAULT_AMOUNT = 10;
private final int amount;
@ -83,7 +89,16 @@ public class TriviaQuery implements Serializable {
public String toString() {
StringBuilder url = new StringBuilder();
url.append(BASE);
// Load custom server URL.
Context c = PluckApplication.getAppContext();
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(c);
String key = c.getResources().getString(R.string.pref_network_server);
// Load default server URL in case the player did not specify a custom server URL.
String defaultServer = c.getResources().getString(R.string.pref_network_server_default);
String base = sp.getString(key, defaultServer) + "?"; // append "?" to the end of the URL so we can specify GET parameters.
url.append(base);
url.append("amount=").append(this.amount);
if (this.category != null & this.category != TriviaCategory.ANY) {

2
app/src/main/res/values/pref_keys.xml
View file

@ -26,4 +26,6 @@ Contact us at <joguitos+pluck@luca0n.com>.
<string name="pref_category_sound">pref_key_category_sound</string>
<string name="pref_sound_answer">pref_sound_answer</string>
<string name="pref_network_tor">pref_network_tor</string>
<string name="pref_network_server">pref_network_server</string>
<string name="pref_network_server_default">https://opentdb.com/api.php</string>
</resources>

7
app/src/main/res/values/strings.xml
View file

@ -90,8 +90,11 @@ Contact us at <joguitos+pluck@luca0n.com>.
<!-- Setting Strings-->
<string name="pref_category_sound_title">Sound</string>
<string name="pref_sound_answer_title">Answer Sound Effect</string>
<string name="pref_sound_answer_summary">Toggles game sound effects.</string>
<string name="pref_category_network_title">Network</string>
<string name="pref_network_tor_title">Connect using Tor</string>
<string name="pref_network_tor_summary">Retrieves trivia data via the Tor network. Requires Orbot.</string>
<string name="pref_network_tor_title">Connect Using Tor</string>
<string name="pref_network_tor_summary">Retrieves trivia data via the Tor network. Requires Orbot (recommended) or a Tor daemon with a SOCKS5 proxy listening on port 9050.</string>
<string name="pref_network_server_title">Server URL</string>
<string name="pref_network_server_summary">Specifies the server location used by the game to fetch questions.</string>
</resources>

9
app/src/main/res/xml/preferences.xml
View file

@ -31,16 +31,21 @@ Contact us at <joguitos+pluck@luca0n.com>.
<CheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_sound_answer"
android:title="@string/pref_sound_answer_title" />
android:title="@string/pref_sound_answer_title"
android:summary="@string/pref_sound_answer_summary" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_category_network_title">
<EditTextPreference
android:defaultValue="@string/pref_network_server_default"
android:key="@string/pref_network_server"
android:title="@string/pref_network_server_title"
android:summary="@string/pref_network_server_summary" />
<CheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_network_tor"
android:title="@string/pref_network_tor_title"
android:summary="@string/pref_network_tor_summary" />
</PreferenceCategory>
</PreferenceScreen>