From 821ad615ee082dd225a8777b080e20cfdcdecfd9 Mon Sep 17 00:00:00 2001
From: yova <yova@freedomhost.de>
Date: Wed, 31 Jan 2024 19:04:43 +0100
Subject: [PATCH] more constraints to layout

---
 app/src/main/AndroidManifest.xml              |   5 +-
 app/src/main/res/layout/activity_login.xml    |  18 +--
 app/src/main/res/layout/activity_metadata.xml | 149 ++++++++++--------
 app/src/main/res/menu/ghost_menu.xml          |   4 +-
 4 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a121a6c..d817ba0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,11 +24,12 @@
         tools:targetApi="31">
         <activity
             android:name=".MetadataActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:label="Metadata"/>
         <activity
             android:name=".LoginActivity"
             android:exported="false"
-            android:label="@string/title_activity_login" />
+            android:label="ghost CMS login" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0088482..0b8591b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -6,7 +6,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-
+    android:padding="5dp"
     tools:context="LoginActivity">
 
     <EditText
@@ -19,7 +19,8 @@
         android:text="@{entry.fakeTitle ?? entry.printTitle}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/username"/>
 
     <EditText
         android:id="@+id/username"
@@ -30,7 +31,8 @@
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/instance" />
+        app:layout_constraintTop_toBottomOf="@+id/instance"
+        app:layout_constraintBottom_toTopOf="@id/password"/>
 
     <EditText
         android:id="@+id/password"
@@ -40,25 +42,23 @@
         android:hint="@string/prompt_password"
         android:imeActionLabel="@string/action_sign_in_short"
         android:imeOptions="actionDone"
-        android:inputType="textPassword"
+        android:inputType="textVisiblePassword"
         android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/username" />
+        app:layout_constraintTop_toBottomOf="@+id/username"
+        app:layout_constraintBottom_toTopOf="@id/login"/>
 
     <Button
         android:id="@+id/login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="64dp"
         android:text="@string/action_sign_in"
         android:onClick="onButtonLoginClick"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/password"
-        app:layout_constraintVertical_bias="0.2" />
+        app:layout_constraintTop_toBottomOf="@+id/password" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_metadata.xml b/app/src/main/res/layout/activity_metadata.xml
index 910327e..04173a2 100644
--- a/app/src/main/res/layout/activity_metadata.xml
+++ b/app/src/main/res/layout/activity_metadata.xml
@@ -6,79 +6,90 @@
     android:layout_height="match_parent"
     tools:context="MetadataActivity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:text="Title:"
+        app:layout_constraintEnd_toEndOf="@+id/barrier2"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/title"
+        app:layout_constraintBottom_toBottomOf="@id/title"/>
+
+    <EditText
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/barrier2"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBaseline_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:gravity="center">
+        app:layout_constraintBottom_toTopOf="@id/feature_image"/>
+
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:text="Feature Image:"
+        app:layout_constraintBottom_toBottomOf="@+id/feature_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/barrier2"
+        app:layout_constraintTop_toTopOf="@+id/feature_image" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Metadata">
-        </TextView>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Title:">
-            </TextView>
-            <EditText
-                android:id="@+id/title"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:selectAllOnFocus="true"/>
+    <EditText
+        android:id="@+id/feature_image"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:autofillHints="drop img URL"
+        android:inputType="text"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/barrier2"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintBottom_toTopOf="@id/url"/>
 
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Feature Image:">
-            </TextView>
-            <EditText
-                android:id="@+id/feature_image"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:inputType="text"
-                android:selectAllOnFocus="true"/>
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="URL:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/barrier2"
+        app:layout_constraintTop_toTopOf="@id/url"
+        app:layout_constraintBottom_toBottomOf="@id/url"
+        android:layout_marginLeft="5dp"/>
+
+    <TextView
+        android:id="@+id/url"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/barrier2"
+        app:layout_constraintTop_toBottomOf="@id/feature_image"
+        app:layout_constraintBottom_toTopOf="@id/login"/>
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="onButtonSaveClick"
+        android:text="Save"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/url" />
 
-        </LinearLayout>
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
-                android:text="URL:"/>
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/barrier2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="right"
+        app:constraint_referenced_ids="textView,textView2,textView3" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/url"/>
-        </LinearLayout>
-        <Button
-            android:id="@+id/login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="64dp"
-            android:layout_marginBottom="64dp"
-            android:text="Save"
-            android:onClick="onButtonSaveClick"
-            />
-    </LinearLayout>
-        
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/ghost_menu.xml b/app/src/main/res/menu/ghost_menu.xml
index ac7a7c2..7444d71 100644
--- a/app/src/main/res/menu/ghost_menu.xml
+++ b/app/src/main/res/menu/ghost_menu.xml
@@ -17,11 +17,11 @@
         android:icon="@android:drawable/ic_menu_upload"
         app:showAsAction="always" />
     <item android:id="@+id/delete_ghost"
-        android:title="delete on  ghost"
+        android:title="Delete on ghost"
         android:icon="@android:drawable/ic_menu_delete"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/settings"
-        android:title="Settings"
+        android:title="Ghost CMS Login"
         android:icon="@android:drawable/ic_menu_preferences"
         app:showAsAction="ifRoom" />
     <item android:id="@+id/image"