From 56670e9015320427547b6eec8aa9d6739a685ce1 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Fri, 24 Jul 2015 03:58:04 +0600
Subject: [PATCH] Update layout

---
 res/layout/activity_launcher.xml | 110 ++++++++++++++++++++++---------
 res/values-ru/strings.xml        |   7 +-
 res/values/strings.xml           |   7 +-
 3 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/res/layout/activity_launcher.xml b/res/layout/activity_launcher.xml
index 790cdde6..33e3cc73 100644
--- a/res/layout/activity_launcher.xml
+++ b/res/layout/activity_launcher.xml
@@ -1,35 +1,83 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="in.celest.xash3d.LauncherActivity"
-    android:id="@+id/layout">
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:paddingLeft="@dimen/activity_horizontal_margin"
+	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingTop="@dimen/activity_vertical_margin"
+	android:paddingBottom="@dimen/activity_vertical_margin"
+	tools:context="in.celest.xash3d.LauncherActivity"
+	android:id="@+id/layout">
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/launch_button"
-        android:id="@+id/button"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true" 
-	android:onClick="startXash"/>
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/launch_button"
+		android:id="@+id/button_launch"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentRight="true"
+		android:onClick="startXash"/>
+	
+	<Button
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/touch_set"
+		android:id="@+id/touch_set"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentLeft="true"
+		android:onClick="controlsSettings"/>
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/cmdArgs"
-        android:layout_below="@+id/textView"
-        android:layout_alignParentLeft="true"
-        android:layout_alignRight="@+id/textView" />
+	<EditText
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/cmdArgs"
+		android:layout_below="@+id/textView_args"
+		android:layout_alignParentLeft="true"
+		android:layout_alignRight="@+id/textView_args"/>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/cmd_args_text"
-        android:id="@+id/textView"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true" />
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="@string/cmd_args_text"
+		android:id="@+id/textView_args"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentRight="true"/>
+
+	<CheckBox
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
+		android:layout_below="@+id/cmdArgs"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="@string/use_controls"
+		android:id="@+id/useControls"/>
+	
+	<EditText
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/cmdPath"
+		android:layout_below="@+id/textView_path"
+		android:layout_alignParentLeft="true"
+		android:layout_alignRight="@+id/textView_path"/>
+	
+	
+	<TextView
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="@string/text_res_path"
+		android:id="@+id/textView_path"
+		android:layout_below="@+id/useControls"/>
+
+	<CheckBox
+		android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
+		android:layout_below="@+id/cmdPath"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="@string/text_show_icon"
+		android:id="@+id/showIcon"/>
+	
 </RelativeLayout>
+
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ce78279f..571edf04 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,5 +3,8 @@
     <string name="cmd_args_text">Аргументы командной строки(только для экспертов)</string>
     <string name="launch_button">Запустить Xash3D</string>
     <string name="title_section1">Команды</string>
-
-</resources>
\ No newline at end of file
+	<string name="use_controls">Включить экранное управление</string>
+	<string name="text_res_path">Путь к ресурсам игры</string>
+	<string name="touch_set">Настройки управления</string>
+	<string name="text_show_icon">Отображать значёк Half-Life</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85420570..69f29053 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="app_name">Half-life</string>
-
+	<string name="launcher_name">Xash3D</string>
     <string-array name="double_tap_actions">
         <item>None</item>
         <item>Shoot</item>
@@ -17,6 +17,9 @@
     <string name="launch_button">Launch Xash3D!</string>
     <string name="action_settings">Settings</string>
     <string name="cmd_args_text">Command line arguments(experts only)</string>
+	<string name="use_controls">Enable touch controls</string>
+	<string name="text_res_path">Path to game resources</string>
     <string name="hello_world">Hello world!</string>
-
+	<string name="touch_set">Controls settings</string>
+	<string name="text_show_icon">Show Half-Life icon</string>
 </resources>