OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Merge branch 'localefix' into nut_arulir_mountain

Browse Source
This commit is contained in:
Gonk
2019-10-30 22:56:13 +01:00
parent ea257dffee f4aa70a3e7
commit 2697d3aad3
20 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View File

@@ -61,13 +61,12 @@ public final class AndorsTrailApplication extends Application {
} else {
activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
setLocale(activity);
}
//Get default locale at startup, as somehow it seems that changing the app's
//configured locale impacts the value returned by Locale.getDefault() nowadays.
private final Locale defaultLocale = Locale.getDefault();
@SuppressLint("NewApi")
public boolean setLocale(Activity context) {
Resources res = context.getResources();

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
View File

@@ -16,7 +16,7 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class AboutActivity extends Activity implements ImageGetter {
public final class AboutActivity extends AndorsTrailBaseActivity implements ImageGetter {
/** Called when the activity is first created. */
@Override

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
View File

@@ -18,7 +18,7 @@ import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
public final class ActorConditionInfoActivity extends Activity {
public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {

26
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java Normal file
View File

@@ -0,0 +1,26 @@
package com.gpl.rpg.AndorsTrail.activity;
import android.app.Activity;
import android.os.Bundle;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
public abstract class AndorsTrailBaseActivity extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
if (!app.isInitialized()) {
return;
}
app.setLocale(this);
}
@Override
protected void onResume() {
super.onResume();
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
app.setLocale(this);
}
}

28
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java Normal file
View File

@@ -0,0 +1,28 @@
package com.gpl.rpg.AndorsTrail.activity;
import android.app.Activity;
import android.content.res.Resources;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public abstract class AndorsTrailBaseFragmentActivity extends FragmentActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
if (!app.isInitialized()) {
return;
}
app.setLocale(this);
}
@Override
protected void onResume() {
super.onResume();
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
app.setLocale(this);
}
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
View File

@@ -29,7 +29,7 @@ import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
* @author ejwessel
* Creates the BulkSelectionInterface dialog that allows for buy/drop/selling
*/
public final class BulkSelectionInterface extends Activity implements TextWatcher {
public final class BulkSelectionInterface extends AndorsTrailBaseActivity implements TextWatcher {
// class variables
public static enum BulkInterfaceType {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
View File

@@ -46,7 +46,7 @@ import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class ConversationActivity
extends Activity
extends AndorsTrailBaseActivity
implements OnKeyListener
, ConversationController.ConversationStatemachine.ConversationStateListener {

4
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
View File

@@ -1,7 +1,7 @@
package com.gpl.rpg.AndorsTrail.activity;
import java.io.File;
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -24,7 +24,7 @@ import android.webkit.WebViewClient;
import android.widget.Button;
import android.widget.Toast;
public final class DisplayWorldMapActivity extends Activity {
public final class DisplayWorldMapActivity extends AndorsTrailBaseActivity {
private WorldContext world;
private WebView displayworldmap_webview;

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
View File

@@ -1,5 +1,6 @@
package com.gpl.rpg.AndorsTrail.activity;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
@@ -18,7 +19,7 @@ import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Stats;
import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class HeroinfoActivity extends FragmentActivity {
public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
private WorldContext world;
private FragmentTabHost tabHost;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
View File

@@ -18,7 +18,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemType;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
public final class ItemInfoActivity extends Activity {
public final class ItemInfoActivity extends AndorsTrailBaseActivity {
public static enum ItemInfoAction {
none, use, equip, unequip, buy, sell

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
View File

@@ -18,7 +18,7 @@ import com.gpl.rpg.AndorsTrail.controller.Constants;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class LevelUpActivity extends Activity {
public final class LevelUpActivity extends AndorsTrailBaseActivity {
private WorldContext world;
private ControllerContext controllers;
private Player player;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
View File

@@ -29,7 +29,7 @@ import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
public final class LoadSaveActivity extends Activity implements OnClickListener {
public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
private boolean isLoading = true;
private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
private static final int SLOT_NUMBER_FIRST_SLOT = 1;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
View File

@@ -22,7 +22,7 @@ import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener {
public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {
private WorldSetup setup;
private Dialog progressDialog;

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -54,7 +54,7 @@ import com.gpl.rpg.AndorsTrail.view.ToolboxView;
import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
public final class MainActivity
extends Activity
extends AndorsTrailBaseActivity
implements
PlayerMovementListener
, CombatActionListener

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
View File

@@ -16,7 +16,7 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
import com.gpl.rpg.AndorsTrail.model.actor.Monster;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class MonsterEncounterActivity extends Activity {
public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
View File

@@ -20,7 +20,7 @@ import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
import com.gpl.rpg.AndorsTrail.view.RangeBar;
import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
public final class MonsterInfoActivity extends Activity {
public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
private WorldContext world;
private ControllerContext controllers;

13
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
View File

@@ -15,11 +15,22 @@ public final class Preferences extends PreferenceActivity {
setTheme(ThemeHelper.getBaseTheme());
requestWindowFeature(Window.FEATURE_NO_TITLE);
super.onCreate(savedInstanceState);
if (AndorsTrailApplication.getApplicationFromActivity(this).getPreferences().fullscreen) {
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
if (app.getPreferences().fullscreen) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else {
getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
app.setLocale(this);
addPreferencesFromResource(R.xml.preferences);
}
@Override
protected void onResume() {
super.onResume();
AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
app.setLocale(this);
}
}

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
View File

@@ -16,7 +16,7 @@ import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class ShopActivity extends FragmentActivity {
public final class ShopActivity extends AndorsTrailBaseFragmentActivity {
@Override
public void onCreate(Bundle savedInstanceState) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
View File

@@ -21,7 +21,7 @@ import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
import com.gpl.rpg.AndorsTrail.model.actor.Player;
import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
public final class SkillInfoActivity extends Activity {
public final class SkillInfoActivity extends AndorsTrailBaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {

2
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
View File

@@ -29,7 +29,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
public final class StartScreenActivity extends FragmentActivity implements OnNewGameRequestedListener, GameCreationOverListener, OnBackStackChangedListener {
public final class StartScreenActivity extends AndorsTrailBaseFragmentActivity implements OnNewGameRequestedListener, GameCreationOverListener, OnBackStackChangedListener {
private TextView tv;
private TextView development_version;