From cc9ef22b283d63dd2159bdb7b576ab6ec1e88735 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Sat, 6 Mar 2021 01:40:22 +0300
Subject: [PATCH] layout fixes

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 app/src/main/res/layout/activity_settings.xml   | 17 +++++++++--------
 .../main/res/layout/activity_web_console.xml    |  4 +---
 app/src/main/res/values-ru/strings.xml          |  7 ++++---
 app/src/main/res/values/strings.xml             |  8 +++++---
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 21f3ff4..c1a6bc0 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/settings_layout"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:padding="@dimen/margin_medium"
+    android:orientation="vertical"
+    tools:context=".SettingsActivity">
 
     <TextView
-        android:id="@+id/settings_section0"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:autoText="true"
+        android:layout_marginBottom="@dimen/margin_tiny"
         android:clickable="false"
-        android:cursorVisible="false"
         android:text="@string/settings_section0"
-        android:textColor="#282528"
-        android:textStyle="bold|italic"
+        android:textSize="24sp"
         android:verticalScrollbarPosition="defaultPosition" />
 
     <Switch
         android:id="@+id/autostart_enable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="left"
+        android:textOff="@string/disabled"
+        android:textOn="@string/enabled"
         android:text="@string/autostart_enabled" />
 
     <View
-        android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?android:attr/listDivider" />
diff --git a/app/src/main/res/layout/activity_web_console.xml b/app/src/main/res/layout/activity_web_console.xml
index 60d22a0..93fef06 100644
--- a/app/src/main/res/layout/activity_web_console.xml
+++ b/app/src/main/res/layout/activity_web_console.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:id="@+id/layout_prompt"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index effb12f..6a0ebae 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">i2pd</string>
     <string name="app_description">Invisible Internet Protocol:</string>
     <string name="app_description2">Сеть без границ</string>
 
@@ -42,13 +41,15 @@
 
     <string name="tunnels_reloading">Перезагрузка конфигурации туннелей...</string>
 
-    <string name="autostart_enabled">Автозагрузка при запуске телефона</string>
+    <string name="autostart_enabled">Запуск после загрузки телефона</string>
 
     <string name="settings_section0">Основные настройки</string>
     <string name="settings_section_tunnels">Туннели</string>
 
     <string name="add_tunnel_button">Добавить</string>
-    <string name="add_tunnel">Добавление туннелей</string>
+    <string name="add_tunnel">Управление туннелями</string>
 
     <string name="del_tunnel_button">Удалить</string>
+    <string name="enabled">Вкл</string>
+    <string name="disabled">Выкл</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d66a64e..1a45068 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,10 +46,12 @@
     <string name="settings_section0">Common settings</string>
     <string name="settings_section_tunnels">Tunnels</string>
 
-    <string name="autostart_enabled">AutoStart on boot</string>
+    <string name="autostart_enabled">Start at boot</string>
     <string name="add_tunnel_button">Add tunnel</string>
-    <string name="add_tunnel">Tunnels adding</string>
+    <string name="add_tunnel">Tunnels management</string>
 
-    <string name="del_tunnel_button">Del tunnel</string>
+    <string name="del_tunnel_button">Delete tunnel</string>
+    <string name="enabled">On</string>
+    <string name="disabled">Off</string>
 
 </resources>