From 9d894cb62e890ebeef5d9938dd859c058aeed54b Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Fri, 5 Mar 2021 03:14:30 +0300
Subject: [PATCH] update main activity layout

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 app/src/main/res/layout/activity_main.xml | 102 +++++++++++++++-------
 app/src/main/res/values-ru/strings.xml    |   3 +
 app/src/main/res/values/strings.xml       |   4 +-
 3 files changed, 75 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 25901e5..101d741 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#9C27B0"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:padding="@dimen/activity_horizontal_margin"
     tools:context="org.purplei2p.i2pd.I2PDActivity">
 
-    <Button
-        android:id="@+id/enableButton"
-        style="@android:style/Widget.Button.Inset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@android:drawable/presence_offline" />
-
-    <Button
-        android:id="@+id/disableButton"
-        style="@android:style/Widget.Button.Inset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:background="@android:drawable/presence_online"
-        android:visibility="invisible" />
-
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <ImageView
@@ -40,20 +19,77 @@
             android:layout_height="140dp"
             android:src="@drawable/ic_logo" />
 
-        <Space
-            android:layout_width="match_parent"
-            android:layout_height="30dp" />
-
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/textViewDesc1"
+            style="@android:style/Widget.Holo.Light.TextView.SpinnerItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal" />
+            android:gravity="center"
+            android:text="@string/app_description"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/textViewDesc2"
+            style="@android:style/Widget.Holo.Light.TextView.SpinnerItem"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/app_description2"
+            android:textColor="#FFFFFF"
+            android:textSize="24sp"
+            android:textStyle="bold" />
 
         <Space
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent" />
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/margin_medium" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_gravity="center">
+
+                <Button
+                    android:id="@+id/enableButton"
+                    style="@android:style/Widget.Button.Inset"
+                    android:layout_width="@dimen/margin_huge"
+                    android:layout_height="@dimen/margin_huge"
+                    android:layout_centerInParent="true"
+                    android:background="@android:drawable/presence_offline"
+                    android:longClickable="true" />
+
+                <Button
+                    android:id="@+id/disableButton"
+                    style="@android:style/Widget.Button.Inset"
+                    android:layout_width="@dimen/margin_huge"
+                    android:layout_height="@dimen/margin_huge"
+                    android:layout_centerInParent="true"
+                    android:background="@android:drawable/presence_online"
+                    android:longClickable="true"
+                    android:visibility="invisible" />
+
+            </RelativeLayout>
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/margin_medium" />
+
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textColor="#DFDFDF"
+                android:textSize="18sp" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9149375..70b61cb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -37,4 +37,7 @@
     <string name="shutdown_canceled">Плановая остановка отменена</string>
 
     <string name="tunnels_reloading">Перезагрузка конфигурации туннелей...</string>
+    <string name="app_description">Invisible Internet Protocol:</string>
+    <string name="action_start">Запустить</string>
+    <string name="app_description2">Сеть без границ</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9bc84a..7a0d7ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">i2pd</string>
+    <string name="app_name" translatable="false">i2pd</string>
+    <string name="app_description">Invisible Internet Protocol:</string>
+    <string name="app_description2">Network without borders</string>
 
     <string name="action_start">Start</string>
     <string name="action_stop">Stop</string>