Mercurial Mercurial > sheepy-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
project_files/Android-build/SDL-android-project/res/layout/team_creation_entry.xml
author Wuzzy <almikes@aol.com>
Fri, 29 Sep 2017 03:41:30 +0200
changeset 12591 7510fe66bfbb
parent 5607 d3a3e80ad1da
permissions -rw-r--r--
Change graves of teams in missions for greater variety In A Space Adventure, only one grave was used for all teams, which was clearly bad.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5467
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     1
 
<?xml version="1.0" encoding="utf-8"?>
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     2
 
<merge xmlns:android="http://schemas.android.com/apk/res/android">
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     3
 
  <RelativeLayout
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     4
 
  		android:layout_width="fill_parent"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     5
 
  		android:layout_height="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     6
 
  		android:background="@drawable/box"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     7
 
  		android:layout_margin="3dp">
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     8
 
  		<Spinner
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
     9
 
  			android:id="@+id/spinTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    10
 
  			android:layout_width="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    11
 
  			android:layout_height="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    12
 
  			android:layout_alignParentRight="true"
5607
d3a3e80ad1da Added several graphics
Xeli
parents: 5467
diff changeset 
    13
 
  			android:layout_toRightOf="@+id/btnTeam1"
d3a3e80ad1da Added several graphics
Xeli
parents: 5467
diff changeset 
    14
 
  			android:background="@drawable/dropdown"/>
5467
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    15
 
  		<EditText
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    16
 
  			android:id="@+id/txtTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    17
 
  			android:layout_width="fill_parent"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    18
 
  			android:layout_height="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    19
 
  			android:layout_below="@id/spinTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    20
 
  			android:background="@drawable/box"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    21
 
  			android:gravity="center"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    22
 
  			android:textColor="#FFF"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    23
 
  			android:text="Arnold"/>
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    24
 
  		<ImageButton
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    25
 
  			android:id="@id/btnTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    26
 
  			android:layout_height="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    27
 
  			android:layout_width="wrap_content"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    28
 
  			android:layout_alignLeft="@id/txtTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    29
 
  			android:layout_above="@id/txtTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    30
 
  			android:layout_alignTop="@id/spinTeam1"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    31
 
  			android:adjustViewBounds="true"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    32
 
  			android:scaleType="centerInside"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    33
 
  			android:background="@android:color/transparent"
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    34
 
  			android:src="@drawable/dice"/>
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    35
 
  </RelativeLayout>
88e25840f532 Main activities for starting up the game, changing gameconfig, selecting and creating teams with their respective layouts and values
Xeli
parents:
diff changeset 
    36
 
</merge>
sheepy-clone