increase margins in layouts

xvello · Dec 15, 2021 · 6de3414 · 6de3414
1 parent 8e5802f
commit 6de3414
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 18 deletions.
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -9,16 +9,40 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="net.xvello.salasana.AboutActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:text="@string/about_text"
-        android:id="@+id/about_text"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:autoText="true"
-        android:autoLink="web|email"
-        android:nestedScrollingEnabled="false" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/about_text1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="30dp"
+            android:autoLink="web|email"
+            android:nestedScrollingEnabled="false"
+            android:text="@string/about_text1"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <TextView
+            android:id="@+id/about_text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
+            android:autoLink="web|email"
+            android:nestedScrollingEnabled="false"
+            android:text="@string/about_text2"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <TextView
+            android:id="@+id/about_text3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:autoLink="web|email"
+            android:nestedScrollingEnabled="false"
+            android:text="@string/about_text3"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,6 +17,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="15dp"
         android:paddingBottom="12dp"
         android:text="@string/intro_text"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
@@ -25,7 +28,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/about_text"
-        android:paddingBottom="12dp"
+        android:layout_marginBottom="15dp"
         android:text="@string/domain_hint_text"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
@@ -42,6 +45,7 @@
         android:id="@+id/pass_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         android:layout_below="@+id/domain_edit"
         android:layout_alignParentStart="true"
         android:ems="10"
@@ -53,6 +57,7 @@
         style="@style/Base.Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         android:layout_below="@+id/pass_edit"
         android:layout_alignParentStart="true"
         android:onClick="generatePassword"
@@ -80,6 +85,6 @@
         android:alpha="0.1"
         android:contentDescription="Background image"
         android:src="@drawable/notification_icon"
-        android:tint="@color/tintBackgroundImage" />
+        app:tint="@color/tintBackgroundImage" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,11 +12,9 @@
     <string name="notification_id">1234</string>
     <string name="footer_text">Based on <a href="http://angel.net/~nic/passwd.current.html">Nic Wolff\'s password generator</a></string>
     <string name="about_title">About Salasana</string>
-    <string name="about_text">
-        "Salasana Android © 2016 Xavier Vello: https://github.com/xvello/salasana-android\n\n"
-        "Based on Nic Wolff's password generator (http://angel.net/~nic/passwd.current.html) version 11 apr 2014\n\n"
-        "Icon based on network-vpn.svg from the Oxygen Project, licensed under LGPLv3 (http://www.gnu.org/licenses/lgpl-3.0.txt)\n\n"
-    </string>
+    <string name="about_text1">Salasana Android © 2016 Xavier Vello: https://github.com/xvello/salasana-android</string>
+    <string name="about_text2">Based on Nic Wolff\'s password generator (http://angel.net/~nic/passwd.current.html) version 11 apr 2014</string>
+    <string name="about_text3">Icon based on network-vpn.svg from the Oxygen Project, licensed under LGPLv3 (http://www.gnu.org/licenses/lgpl-3.0.txt)</string>
     <string name="send_intent_name">Generate Password</string>
     <string name="about_action_title">About Salasana</string>
     <string name="intro_text">This form will generate a unique password for this domain and paste it in your clipboard. After you use it, dismiss the notification to delete it from the clipboard.</string>