Skip to content

Commit

Permalink
Merge pull request #237 from ajayyy/improvements
Browse files Browse the repository at this point in the history 
Fixed Layouts
  • Loading branch information
@ajayyy
ajayyy authored Feb 25, 2019
2 parents 4a5ee39 + 7440263 commit 350aad3
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 79 deletions.
3 changes: 2 additions & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ android {
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:percent:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'commons-io:commons-io:2.4'
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:gridlayout-v7:27.1.1'
}

apply plugin: 'com.google.gms.google-services'
Expand Down
19 changes: 9 additions & 10 deletions app/src/main/res/layout-sw600dp/postgame_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,26 @@
android:layout_height="wrap_content"
android:id="@+id/endgameTableLayout"
android:layout_margin="10dp"
android:rowCount="9"
android:columnCount="6">
android:rowCount="3"
android:columnCount="5">

<TextView
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_width="210dp"
android:layout_row="0"
android:layout_column="0"
android:text="Climb: "
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textSize="@dimen/text_medium"
android:gravity="center"/>
android:textSize="@dimen/text_medium"/>

<Spinner
android:id="@+id/endgameClimbType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_row="0"
android:layout_column="1"
android:layout_columnSpan="5"
android:layout_columnSpan="4"
android:layout_gravity="center_vertical" />

<Spinner
Expand All @@ -42,12 +41,12 @@
android:layout_height="wrap_content"
android:layout_row="1"
android:layout_column="0"
android:layout_columnSpan="5"
android:layout_columnSpan="4"
android:layout_gravity="center_vertical" />

<TextView
android:text="Robots Carried:"
android:layout_width="80dp"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:textSize="@dimen/text_medium"
android:layout_row="2"
Expand All @@ -61,7 +60,7 @@
android:paddingBottom="10dp"
android:layout_row="2"
android:layout_column="1"
android:layout_columnSpan="2"/>
android:layout_columnSpan="4"/>

</GridLayout>

Expand Down
59 changes: 29 additions & 30 deletions app/src/main/res/layout-sw600dp/pregame_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
android:layout_height="match_parent">


<GridLayout
<android.support.v7.widget.GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:rowCount="4"
android:columnCount="3"
android:orientation="vertical"
app:rowCount="3"
app:columnCount="3"
app:orientation="vertical"
android:layout_margin="10dp">


Expand All @@ -32,21 +32,20 @@
android:paddingBottom="10dp"
android:paddingRight="50dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="0"
android:layout_column="0"
android:layout_columnSpan="1"
/>
app:layout_row="0"
app:layout_column="0"
app:layout_columnSpan="1"/>

<Spinner
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize = "@dimen/text_small"
android:id="@+id/autoStartLocation"
android:spinnerMode="dropdown"
android:layout_row="0"
android:layout_column="1"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal"/>
app:layout_row="0"
app:layout_column="1"
app:layout_columnSpan="2"
app:layout_gravity="fill_horizontal"/>

<TextView
android:text="Start Platform: "
Expand All @@ -57,9 +56,9 @@
android:paddingBottom="10dp"
android:paddingRight="50dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="1"
android:layout_column="0"
android:layout_columnSpan="1"
app:layout_row="1"
app:layout_column="0"
app:layout_columnSpan="1"
/>

<Spinner
Expand All @@ -68,10 +67,10 @@
android:textSize = "@dimen/text_small"
android:id="@+id/autoStartPlatform"
android:spinnerMode="dropdown"
android:layout_row="1"
android:layout_column="1"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal"/>
app:layout_row="1"
app:layout_column="1"
app:layout_columnSpan="2"
app:layout_gravity="fill_horizontal"/>

<TextView
android:text="Started with: "
Expand All @@ -81,34 +80,34 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="2"
android:layout_column="0"
android:layout_columnSpan="1" />
app:layout_row="2"
app:layout_column="0"
app:layout_columnSpan="1" />

<CheckBox
android:layout_weight="1"
android:layout_columnWeight="1"
android:layout_gravity="fill_horizontal"
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"
android:id="@+id/startingObjectsCargo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_row="2"
android:layout_column="1"
app:layout_row="2"
app:layout_column="1"
android:checked="false"
android:text="Cargo"
android:textSize="@dimen/text_medium" />

<CheckBox
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_row="2"
android:layout_column="2"
app:layout_row="2"
app:layout_column="2"
android:id="@+id/startingObjectsHatch"
android:layout_columnWeight="1"
app:layout_columnWeight="1"
android:text="Hatch"
android:textSize="@dimen/text_medium"/>

</GridLayout>
</android.support.v7.widget.GridLayout>

</ScrollView>

Expand Down
17 changes: 8 additions & 9 deletions app/src/main/res/layout/postgame_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,26 @@
android:layout_height="wrap_content"
android:id="@+id/endgameTableLayout"
android:layout_margin="10dp"
android:rowCount="9"
android:columnCount="6">
android:rowCount="3"
android:columnCount="5">

<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_width="150dp"
android:layout_row="0"
android:layout_column="0"
android:text="Climb: "
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textSize="@dimen/text_medium"
android:gravity="center"/>
android:textSize="@dimen/text_medium"/>

<Spinner
android:id="@+id/endgameClimbType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_row="0"
android:layout_column="1"
android:layout_columnSpan="5"
android:layout_columnSpan="4"
android:layout_gravity="center_vertical" />

<Spinner
Expand All @@ -42,12 +41,12 @@
android:layout_height="wrap_content"
android:layout_row="1"
android:layout_column="0"
android:layout_columnSpan="5"
android:layout_columnSpan="4"
android:layout_gravity="center_vertical" />

<TextView
android:text="Robots Carried:"
android:layout_width="80dp"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:textSize="@dimen/text_medium"
android:layout_row="2"
Expand All @@ -61,7 +60,7 @@
android:paddingBottom="10dp"
android:layout_row="2"
android:layout_column="1"
android:layout_columnSpan="2"/>
android:layout_columnSpan="4"/>

</GridLayout>

Expand Down
58 changes: 29 additions & 29 deletions app/src/main/res/layout/pregame_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
android:layout_height="match_parent">


<GridLayout
<android.support.v7.widget.GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:rowCount="4"
android:columnCount="3"
android:orientation="vertical"
app:rowCount="3"
app:columnCount="3"
app:orientation="vertical"
android:layout_margin="10dp">


Expand All @@ -32,9 +32,9 @@
android:paddingBottom="10dp"
android:paddingRight="50dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="0"
android:layout_column="0"
android:layout_columnSpan="1"
app:layout_row="0"
app:layout_column="0"
app:layout_columnSpan="1"
/>

<Spinner
Expand All @@ -43,10 +43,10 @@
android:textSize = "@dimen/text_small"
android:id="@+id/autoStartLocation"
android:spinnerMode="dropdown"
android:layout_row="0"
android:layout_column="1"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal"/>
app:layout_row="0"
app:layout_column="1"
app:layout_columnSpan="2"
app:layout_gravity="fill_horizontal"/>

<TextView
android:text="Start Platform: "
Expand All @@ -57,9 +57,9 @@
android:paddingBottom="10dp"
android:paddingRight="50dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="1"
android:layout_column="0"
android:layout_columnSpan="1"
app:layout_row="1"
app:layout_column="0"
app:layout_columnSpan="1"
/>

<Spinner
Expand All @@ -68,10 +68,10 @@
android:textSize = "@dimen/text_small"
android:id="@+id/autoStartPlatform"
android:spinnerMode="dropdown"
android:layout_row="1"
android:layout_column="1"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal"/>
app:layout_row="1"
app:layout_column="1"
app:layout_columnSpan="2"
app:layout_gravity="fill_horizontal"/>

<TextView
android:text="Started with: "
Expand All @@ -81,34 +81,34 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_alignTop="@+id/tableLayout"
android:layout_row="2"
android:layout_column="0"
android:layout_columnSpan="1" />
app:layout_row="2"
app:layout_column="0"
app:layout_columnSpan="1" />

<CheckBox
android:layout_weight="1"
android:layout_columnWeight="1"
android:layout_gravity="fill_horizontal"
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"
android:id="@+id/startingObjectsCargo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_row="2"
android:layout_column="1"
app:layout_row="2"
app:layout_column="1"
android:checked="false"
android:text="Cargo"
android:textSize="@dimen/text_small" />

<CheckBox
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_row="2"
android:layout_column="2"
app:layout_row="2"
app:layout_column="2"
android:id="@+id/startingObjectsHatch"
android:layout_columnWeight="1"
app:layout_columnWeight="1"
android:text="Hatch"
android:textSize="@dimen/text_small"/>

</GridLayout>
</android.support.v7.widget.GridLayout>

</ScrollView>

Expand Down

0 comments on commit 350aad3

Please sign in to comment.