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

More progress on the UI skinning effort. Combat view now shows an AP

Browse Source 
bar.
This commit is contained in:
Zukero
2017-11-05 17:37:50 +01:00
parent e4be5d35a8
commit a017fbcf67
16 changed files with 166 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndorsTrail/res/layout/bulkselection.xml
View File

@@ -8,7 +8,7 @@
<TextView
android:id="@+id/bulkselection_itemname"
style="@style/titleWithIcon"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/ui_blue_richframe"

11
AndorsTrail/res/layout/combatview.xml
View File

@@ -26,17 +26,11 @@
android:text="@string/combat_attack"
android:textSize="@dimen/actionbar_text" />
<TextView
<com.gpl.rpg.AndorsTrail.view.RangeBar
android:id="@+id/combatview_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:shadowColor="#000"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="1"
android:text="@string/status_ap"
android:textSize="@dimen/actionbar_text" />
android:layout_weight="1" />
<Button
android:id="@+id/combatview_endturn"
@@ -59,6 +53,7 @@
android:id="@+id/combatview_monsterismoving"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@id/combatview_actionbar"
android:layout_alignBottom="@id/combatview_actionbar"
android:gravity="center"
android:paddingBottom="4sp"

147
AndorsTrail/res/layout/custom_dialog_title_icon.xml
View File

@@ -2,83 +2,96 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:minHeight="53dip"
android:minWidth="50dp"
android:orientation="vertical"
android:paddingBottom="9dip"
android:paddingEnd="20dip"
android:paddingStart="20dip"
android:paddingTop="9dip" >
android:orientation="horizontal" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal" />
<TextView
android:id="@+id/dialog_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/char_hero"
android:gravity="center_vertical" />
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.1"
android:orientation="vertical" />
<LinearLayout
android:id="@+id/dialog_description_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" >
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.8"
android:orientation="vertical" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal" />
<TextView
android:id="@+id/dialog_description"
android:id="@+id/dialog_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/dialog_content_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" />
<LinearLayout
android:id="@+id/dialog_button_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" >
<Button
android:id="@+id/dialog_template_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:background="@drawable/ui_blue_richframe"
android:drawableLeft="@drawable/char_hero"
android:gravity="center_vertical" />
<LinearLayout
android:id="@+id/dialog_description_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" >
<TextView
android:id="@+id/dialog_description"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/dialog_content_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" />
<LinearLayout
android:id="@+id/dialog_button_container"
style="@style/AndorsTrail_Blue_StdFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp" >
<Button
android:id="@+id/dialog_template_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal" />
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.1"
android:orientation="vertical" />
</LinearLayout>

6
AndorsTrail/res/layout/displayworldmap.xml
View File

@@ -32,14 +32,14 @@
android:layout_height="match_parent"
android:background="@drawable/ui_blue_stdframe"
android:orientation="vertical"
android:layerType="software" >
>
<WebView
android:id="@+id/displayworldmap_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:layerType="software" />
android:background="@color/displayworldmap_background"
/>
</LinearLayout>
</LinearLayout>

71
AndorsTrail/res/layout/levelup.xml
View File

@@ -29,53 +29,48 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical"
android:paddingLeft="5dp"
android:paddingRight="5dp" >
<LinearLayout
style="@style/AndorsTrail_Blue_StdFrame"
<Button
android:id="@+id/levelup_add_health"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:text="@string/levelup_add_health" />
<Button
android:id="@+id/levelup_add_health"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_health" />
<Button
android:id="@+id/levelup_add_attackchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackchance" />
<Button
android:id="@+id/levelup_add_attackchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackchance" />
<Button
android:id="@+id/levelup_add_attackdamage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackdamage" />
<Button
android:id="@+id/levelup_add_attackdamage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_attackdamage" />
<Button
android:id="@+id/levelup_add_blockchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_blockchance" />
<Button
android:id="@+id/levelup_add_blockchance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/levelup_add_blockchance" />
<TextView
android:id="@+id/levelup_adds_new_skillpoint"
style="@style/textWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ui_icon_skill"
android:text="@string/levelup_adds_new_skillpoint" />
<TextView
android:id="@+id/levelup_adds_new_skillpoint"
style="@style/textWithIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ui_icon_skill"
android:text="@string/levelup_adds_new_skillpoint" />
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
<ListView
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@null" />
</LinearLayout>
<ListView
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@null" />
</LinearLayout>
</ScrollView>

3
AndorsTrail/res/layout/loadsave.xml
View File

@@ -28,7 +28,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
style="@style/AndorsTrail_Blue_StdFrame"
>
<LinearLayout

7
AndorsTrail/res/layout/quickbuttons_usable_inventory.xml
View File

@@ -5,7 +5,7 @@
android:gravity="left"
android:orientation="vertical" >
<TextView
<!-- <TextView
android:id="@+id/quickslot_assign_title"
style="@style/titleWithIcon"
android:layout_width="match_parent"
@@ -20,12 +20,11 @@
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe"
android:text="@string/inventory_selectitem"
android:textColor="@color/ui_blue_textbutton_textcolor" />
android:textColor="@color/ui_blue_textbutton_textcolor" /> -->
<ListView
android:id="@+id/quickbuttons_assignlist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/ui_blue_stdframe" />
android:layout_height="wrap_content" />
</LinearLayout>

3
AndorsTrail/res/values/ui_colors.xml
View File

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="displayworldmap_background">#423921</color>
<color name="displayworldmap_background">#122438</color>
<color name="ui_blue_stdframe_bg">#122438</color>
</resources>

15
AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
View File

@@ -35,14 +35,18 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnDismissListener;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.ScrollView;
import android.widget.Toast;
public final class Dialogs {
@@ -400,16 +404,21 @@ public final class Dialogs {
public static void showCombatLog(final Context context, final ControllerContext controllerContext, final WorldContext world) {
final String[] combatLogMessages = world.model.combatLog.getAllMessages();
ListView itemList = null;
View view = null;
String msg = null;
if (combatLogMessages.length > 0) {
ListView itemList = null;
itemList = new ListView(context);
itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
itemList.setPadding(20, 0, 20, 20);
itemList.setStackFromBottom(true);
itemList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
itemList.setChoiceMode(ListView.CHOICE_MODE_NONE);
itemList.setBackgroundResource(R.color.ui_blue_stdframe_bg);
itemList.setAdapter(new ArrayAdapter<String>(context, R.layout.combatlog_row, android.R.id.text1, combatLogMessages));
// ScrollView sv = new ScrollView(context);
// sv.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0));
// sv.addView(itemList);
view = itemList;
} else {
msg = context.getResources().getString(R.string.combat_log_noentries);
}
@@ -425,7 +434,7 @@ public final class Dialogs {
context.getResources().getString(R.string.combat_log_title),
context.getResources().getDrawable(R.drawable.ui_icon_combat),
msg,
itemList,
view,
true);

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

@@ -12,6 +12,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.TextView;
@@ -25,6 +26,7 @@ public class CustomDialog {
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.custom_dialog_title_icon);
dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent);
dialog.getWindow().getAttributes().width=WindowManager.LayoutParams.MATCH_PARENT;
TextView titleView = (TextView) dialog.findViewById(R.id.dialog_title);
if (title != null || icon != null) {

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

@@ -89,19 +89,19 @@ public final class DisplayWorldMapActivity extends Activity {
+ (world.model.player.position.y + map.worldPosition.y-1) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
L.log("Showing " + url);
displayworldmap_webview.loadUrl(url);
displayworldmap_webview.setBackgroundColor(getResources().getColor(android.R.color.transparent));
displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
// if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
displayworldmap_webview.setWebViewClient(new WebViewClient()
{
@SuppressLint("NewApi")
@Override
public void onPageFinished(WebView view, String url)
{
displayworldmap_webview.setBackgroundColor(0x00000000);
if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
}
});
// displayworldmap_webview.setWebViewClient(new WebViewClient()
// {
// @SuppressLint("NewApi")
// @Override
// public void onPageFinished(WebView view, String url)
// {
// displayworldmap_webview.setBackgroundColor(0x00000000);
// if (Build.VERSION.SDK_INT >= 11) displayworldmap_webview.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
// }
// });
}
}

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

@@ -67,6 +67,7 @@ public final class LoadSaveActivity extends Activity implements OnClickListener
if (!isLoading) {
createNewSlot.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
createNewSlot.setOnClickListener(this);
newSlotContainer.setVisibility(View.VISIBLE);
} else {
newSlotContainer.setVisibility(View.GONE);
}

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

@@ -239,7 +239,10 @@ public final class MainActivity
final ItemContainerAdapter inventoryListAdapter = new QuickslotsItemContainerAdapter(lv.getContext(), world.tileManager, world.model.player.inventory.usableItems(), world.model.player, wornTiles);
lv.setAdapter(inventoryListAdapter);
final Dialog d = CustomDialog.createDialog(v.getContext(), null, null, null, lv, false);
final Dialog d = CustomDialog.createDialog(v.getContext(),
v.getResources().getString(R.string.inventory_assign),
v.getResources().getDrawable(R.drawable.ui_icon_equipment),
v.getResources().getString(R.string.inventory_selectitem), view, false);
lv.setOnItemClickListener(new OnItemClickListener() {

1
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
View File

@@ -167,6 +167,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
}
if (effects_hit.isEmpty()) effects_hit = null;
if (effects_kill.isEmpty()) effects_kill = null;
if (effects_hitReceived.isEmpty()) effects_hitReceived = null;
actorinfo_onhiteffects.update(null, null, effects_hit, effects_kill, effects_hitReceived, null, false);

16
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ATDialog.java
View File

@@ -1,16 +0,0 @@
package com.gpl.rpg.AndorsTrail.view;
import com.gpl.rpg.AndorsTrail.R;
import android.app.Dialog;
import android.content.Context;
public class ATDialog extends Dialog {
public ATDialog(Context context) {
super(context, R.style.AndorsTrailStyle_Dialog);
}
}

13
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
View File

@@ -33,7 +33,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
public final class CombatView extends RelativeLayout implements CombatSelectionListener, CombatTurnListener, ActorStatsListener, ActorConditionListener {
private final TextView statusTextView;
private final RangeBar playerAPBar;
private final Button attackMoveButton;
private final ImageButton monsterInfo;
private final RangeBar monsterHealth;
@@ -70,7 +70,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
setFocusable(false);
inflate(context, R.layout.combatview, this);
findViewById(R.id.combatview_fixedarea).setBackgroundResource(R.drawable.ui_gradientshape_translucent);
// findViewById(R.id.combatview_fixedarea).setBackgroundResource(R.drawable.ui_gradientshape_translucent);
// this.setBackgroundResource(R.drawable.ui_gradientshape_translucent);
final CombatController c = controllers.combatController;
@@ -97,7 +97,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
}
});
statusTextView = (TextView) findViewById(R.id.combatview_status);
playerAPBar = (RangeBar) findViewById(R.id.combatview_status);
playerAPBar.init(R.drawable.ui_progress_exp, R.string.status_ap);
monsterInfo = (ImageButton) findViewById(R.id.combatview_monsterinfo);
monsterInfo.setOnClickListener(new OnClickListener() {
@@ -125,8 +126,8 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
activeConditions = new DisplayActiveActorConditionIcons(controllers, world, context, activeConditionsBar);
monsterBar.setBackgroundColor(res.getColor(color.transparent));
actionBar.setBackgroundColor(res.getColor(color.transparent));
// monsterBar.setBackgroundColor(res.getColor(color.transparent));
// actionBar.setBackgroundColor(res.getColor(color.transparent));
displayAnimation = AnimationUtils.loadAnimation(context, R.anim.showcombatbar);
hideAnimation = AnimationUtils.loadAnimation(context, R.anim.hidecombatbar);
@@ -180,7 +181,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
monsterHealth.update(m.getMaxHP(), m.getCurrentHP());
}
private void updatePlayerAP() {
statusTextView.setText(res.getString(R.string.combat_status_ap, player.getCurrentAP()));
playerAPBar.update(player.getMaxAP(), player.getCurrentAP());
updateAttackMoveButtonText();
}
private void updateSelectedMonster(Monster selectedMonster) {