Skip to content

Commit

Permalink
Add settings button, assets, and empty layout for app.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iotitan
iotitan committed Jul 15, 2018
1 parent 673f370 commit 5f8b2a7
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 58 deletions.
Binary file added LocalTrainCTC/app/src/main/res/drawable/settings_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 72 additions & 58 deletions LocalTrainCTC/app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
Expand All @@ -8,79 +8,93 @@
android:padding="10dp"
tools:context=".MainActivity">

<TextView
android:id="@+id/signalStateText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/signal_state_title_text"
android:textAppearance="@android:style/TextAppearance.Material.Title" />

<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:gravity="center">

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_green"
style="@style/LargeSignalButton"
custom:enabledColor="@color/buttonGreen"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter" />
android:layout_height="match_parent"
android:orientation="vertical" >

<LinearLayout
<TextView
android:id="@+id/signalStateText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:text="@string/signal_state_title_text"
android:textAppearance="@android:style/TextAppearance.Material.Title" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:gravity="center">

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_yellow"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonYellow"
android:id="@+id/button_green"
style="@style/LargeSignalButton"
custom:enabledColor="@color/buttonGreen"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter" />

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_yellow_blink"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonYellow"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter"
android:src="@drawable/button_stripes_overlay" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

</LinearLayout>
<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_yellow"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonYellow"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_yellow_blink"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonYellow"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter"
android:src="@drawable/button_stripes_overlay" />

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_red"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonRed"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter" />
</LinearLayout>

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_red_blink"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonRed"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter"
android:src="@drawable/button_stripes_overlay" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_red"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonRed"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter" />

<zone.mattjones.localtrainctc.SignalColorButton
android:id="@+id/button_red_blink"
style="@style/SmallSignalButton"
custom:enabledColor="@color/buttonRed"
custom:disabledColor="@color/buttonDisabled"
android:scaleType="fitCenter"
android:src="@drawable/button_stripes_overlay" />

</LinearLayout>

</LinearLayout>

<Switch
android:id="@+id/signal_enabled_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:switchTextAppearance="@android:style/TextAppearance.Material.Title"
android:text="@string/signal_enabled_title_text"
android:textAppearance="@android:style/TextAppearance.Material.Title" />
</LinearLayout>

<Switch
android:id="@+id/signal_enabled_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:switchTextAppearance="@android:style/TextAppearance.Material.Title"
android:text="@string/signal_enabled_title_text"
android:textAppearance="@android:style/TextAppearance.Material.Title" />
<ImageButton
android:id="@+id/settings_button"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
android:scaleType="fitCenter"
android:src="@drawable/settings_icon" />

</LinearLayout>
</FrameLayout>
5 changes: 5 additions & 0 deletions LocalTrainCTC/app/src/main/res/layout/dialog_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">

</FrameLayout>
Binary file added assets/settings_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/settings_icon.psd
View file
Binary file not shown.

0 comments on commit 5f8b2a7

Please sign in to comment.