Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doubles/Triples Updates #318

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Doubles/Triples Updates #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0efce12
Doubles/Triples Updates
VeteranPadgett May 10, 2019
cd98605
USUM Release
VeteranPadgett Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.podevs.android.poAndroid"
android:installLocation="auto"
android:versionCode="56"
android:versionName="2.7.2.1" >
android:versionCode="57"
android:versionName="2.7.3.0" >

<uses-sdk
android:minSdkVersion="12"
Expand Down
335 changes: 205 additions & 130 deletions res/layout-land/battle_mainscreen.xml
View file
Open in desktop

Large diffs are not rendered by default.

848 changes: 848 additions & 0 deletions res/layout-land/battle_mainscreen_doubles.xml
View file
Open in desktop

Large diffs are not rendered by default.

977 changes: 977 additions & 0 deletions res/layout-land/battle_mainscreen_triples.xml
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 24 additions & 22 deletions res/layout-small/battle_mainscreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,14 @@
android:contentDescription="@string/sprite_description" />

<RelativeLayout
android:id="@+id/pokeInfoA1"
android:layout_width="fill_parent"
android:layout_height="38dp"
android:layout_toLeftOf="@id/pokeSpriteA1"
android:background="@drawable/battle_border" >

<com.podevs.android.poAndroid.TextProgressBar
android:id="@+id/hpBarA"
android:id="@+id/hpBarA1"
android:layout_width="fill_parent"
android:layout_height="10dp"
android:layout_alignParentTop="true"
Expand All @@ -136,41 +137,41 @@
android:progressDrawable="@drawable/green_progress" />

<TextView
android:id="@+id/currentPokeNameA"
android:id="@+id/currentPokeNameA1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/hpBarA"
android:layout_below="@id/hpBarA1"
android:textColor="@color/poke_text_color"
android:textIsSelectable="true" />

<TextView
android:id="@+id/currentPokeLevelA"
android:id="@+id/currentPokeLevelA1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/hpBarA"
android:layout_below="@id/hpBarA1"
android:layout_marginLeft="2dp"
android:textColor="@color/poke_text_color"
android:textIsSelectable="false" />

<ImageView
android:id="@+id/currentPokeGenderA"
android:id="@+id/currentPokeGenderA1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/hpBarA"
android:layout_below="@id/hpBarA1"
android:layout_marginLeft="2dp"
android:layout_marginTop="3dp"
android:layout_toLeftOf="@id/currentPokeLevelA"
android:layout_toLeftOf="@id/currentPokeLevelA1"
android:contentDescription="@string/gender_description" />

<ImageView
android:id="@+id/currentPokeStatusA"
android:id="@+id/currentPokeStatusA1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/hpBarA"
android:layout_below="@id/hpBarA1"
android:layout_marginTop="3dp"
android:layout_toLeftOf="@id/currentPokeGenderA"
android:layout_toLeftOf="@id/currentPokeGenderA1"
android:contentDescription="@string/status_description" />
</RelativeLayout>

Expand All @@ -183,14 +184,15 @@
android:contentDescription="@string/sprite_description" />

<RelativeLayout
android:id="@+id/pokeInfoB1"
android:layout_width="fill_parent"
android:layout_height="38dp"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/pokeSpriteB1"
android:background="@drawable/battle_border" >

<com.podevs.android.poAndroid.TextProgressBar
android:id="@+id/hpBarB"
android:id="@+id/hpBarB1"
android:layout_width="fill_parent"
android:layout_height="10dp"
android:layout_alignParentBottom="true"
Expand All @@ -199,39 +201,39 @@
android:progressDrawable="@drawable/green_progress" />

<TextView
android:id="@+id/currentPokeNameB"
android:id="@+id/currentPokeNameB1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/hpBarB"
android:layout_above="@id/hpBarB1"
android:layout_alignParentLeft="true"
android:textColor="@color/poke_text_color" />

<TextView
android:id="@+id/currentPokeLevelB"
android:id="@+id/currentPokeLevelB1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/hpBarB"
android:layout_above="@id/hpBarB1"
android:layout_alignParentRight="true"
android:layout_marginLeft="2dp"
android:textColor="@color/poke_text_color" />

<ImageView
android:id="@+id/currentPokeGenderB"
android:id="@+id/currentPokeGenderB1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/hpBarB"
android:layout_above="@id/hpBarB1"
android:layout_marginBottom="3dp"
android:layout_marginLeft="2dp"
android:layout_toLeftOf="@id/currentPokeLevelB"
android:layout_toLeftOf="@id/currentPokeLevelB1"
android:contentDescription="@string/hp_bar_description" />

<ImageView
android:id="@+id/currentPokeStatusB"
android:id="@+id/currentPokeStatusB1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/hpBarB"
android:layout_above="@id/hpBarB1"
android:layout_marginBottom="3dp"
android:layout_toLeftOf="@id/currentPokeGenderB"
android:layout_toLeftOf="@id/currentPokeGenderB1"
android:contentDescription="@string/gender_description" />
</RelativeLayout>
<!-- android:layout_alignBottom="@id/hpBarB" -->
Expand Down
Loading