From 551ee22aafae99c1f0802ec48f43d448cc77db37 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 22 Jul 2021 15:31:08 +0200
Subject: first implementation of the gateway button, started to remove labels
 from EipFragment, implement method to get the avearage load of a location as
 an enum value

---
 app/src/main/res/layout/v_location_button.xml | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/src/main/res/layout/v_location_button.xml

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
new file mode 100644
index 00000000..7425231e
--- /dev/null
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_gravity="center_vertical"
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="@dimen/stdpadding"
+    android:background="@drawable/cust_button_primary_rect"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/text_location"
+        android:padding="@dimen/stdpadding"
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        tools:text="Seattle"
+        />
+
+    <se.leap.bitmaskclient.base.views.LocationIndicator
+        android:id="@+id/load_indicator"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:visibility="visible"
+        android:layout_gravity="center_vertical"
+        />
+
+
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
-- 
cgit v1.2.3


From a45f69a96ccdcc0f1d1aae18c9dcf17bf9d15e73 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 23 Jul 2021 23:50:02 +0200
Subject: add click listener to gateway selection button, open the gateway
 selection fragment

---
 app/src/main/res/layout/v_location_button.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 7425231e..9e5445a4 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -4,8 +4,6 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_gravity="center_vertical"
-    android:clickable="true"
-    android:focusable="true"
     android:padding="@dimen/stdpadding"
     android:background="@drawable/cust_button_primary_rect"
     android:layout_height="wrap_content">
-- 
cgit v1.2.3


From 546b823b0c1694657e6b63f23d8b72015b00d282 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 31 Jul 2021 16:34:09 +0200
Subject: adapt EIP main screen and strings to simply secure proposals

---
 app/src/main/res/layout/v_location_button.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 9e5445a4..d8eed9a3 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -6,11 +6,10 @@
     android:layout_gravity="center_vertical"
     android:padding="@dimen/stdpadding"
     android:background="@drawable/cust_button_primary_rect"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
-        android:padding="@dimen/stdpadding"
         android:layout_weight="1"
         android:layout_width="0dp"
         android:maxLines="1"
-- 
cgit v1.2.3


From 4ebc200dc2f7bcded3047fca26d427c5248587f7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 20:52:33 +0100
Subject: add horizontal padding to location button text

---
 app/src/main/res/layout/v_location_button.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index d8eed9a3..b0180ee5 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -10,6 +10,10 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
         android:layout_weight="1"
         android:layout_width="0dp"
         android:maxLines="1"
-- 
cgit v1.2.3


From 3fc8ce49531d475886b27921155c94fc3cabd177 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 15 Nov 2021 21:53:26 +0100
Subject: replace location marker icon by www/globe icon, similar to desktop

---
 app/src/main/res/layout/v_location_button.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index b0180ee5..6bc8637f 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -8,6 +8,12 @@
     android:background="@drawable/cust_button_primary_rect"
     android:layout_height="match_parent">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_web"
+        android:layout_gravity="center"
+        />
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
         android:paddingStart="@dimen/stdpadding"
-- 
cgit v1.2.3


From 7436008db89d4ddf4f918fc220dc813b3289d0d7 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Nov 2021 00:12:38 +0100
Subject: add bridge indicator to bottom panel

---
 app/src/main/res/layout/v_location_button.xml | 44 +++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 6 deletions(-)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 6bc8637f..6a7214c8 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
@@ -9,8 +9,12 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/world_icn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:scaleType="fitXY"
         android:src="@drawable/ic_web"
         android:layout_gravity="center"
         />
@@ -20,26 +24,54 @@
         android:paddingLeft="@dimen/stdpadding"
         android:paddingEnd="@dimen/stdpadding"
         android:paddingRight="@dimen/stdpadding"
-        android:layout_weight="1"
-        android:layout_width="0dp"
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_toEndOf="@id/world_icn"
+        android:layout_toRightOf="@+id/world_icn"
+        android:layout_toLeftOf="@+id/bridge_icn"
+        android:layout_toStartOf="@+id/bridge_icn"
         android:layout_gravity="center_vertical"
+        android:layout_centerInParent="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textStyle="bold"
         android:textColor="@color/white"
-        tools:text="Seattle"
+        tools:text="Seattle along message"
+        />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/bridge_icn"
+        android:paddingRight="@dimen/stdpadding"
+        android:paddingEnd="@dimen/stdpadding"
+        android:paddingStart="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:layout_marginBottom="-5dp"
+        android:layout_marginTop="-5dp"
+        android:scaleType="fitXY"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toStartOf="@id/load_indicator"
+        android:layout_toLeftOf="@id/load_indicator"
+        android:src="@drawable/ic_bridge_36"
+        android:visibility="gone"
         />
 
     <se.leap.bitmaskclient.base.views.LocationIndicator
         android:id="@+id/load_indicator"
+        android:layout_marginBottom="4dp"
         android:layout_width="48dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@id/text_location"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:visibility="visible"
         android:layout_gravity="center_vertical"
         />
 
 
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 9cf45bbcc1e707525fecdac5e691adebf0c28cb5 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 20 Nov 2021 13:42:59 +0100
Subject: show lightning bold instead of text 'You're connected to the
 recommended location'

---
 app/src/main/res/layout/v_location_button.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'app/src/main/res/layout/v_location_button.xml')

diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 6a7214c8..8cba9d70 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -18,6 +18,21 @@
         android:src="@drawable/ic_web"
         android:layout_gravity="center"
         />
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/recommended_icn"
+        android:scaleType="fitXY"
+        android:layout_marginRight="-13dp"
+        android:layout_marginEnd="-13dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/text_location"
+        android:layout_alignBottom="@+id/text_location"
+        android:layout_toEndOf="@id/world_icn"
+        android:layout_toRightOf="@id/world_icn"
+        android:src="@drawable/ic_lightning_bolt"
+        android:visibility="gone"
+        tools:visibility="visible"
+        />
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text_location"
         android:paddingStart="@dimen/stdpadding"
@@ -28,8 +43,8 @@
         android:ellipsize="end"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_toEndOf="@id/world_icn"
-        android:layout_toRightOf="@+id/world_icn"
+        android:layout_toEndOf="@id/recommended_icn"
+        android:layout_toRightOf="@+id/recommended_icn"
         android:layout_toLeftOf="@+id/bridge_icn"
         android:layout_toStartOf="@+id/bridge_icn"
         android:layout_gravity="center_vertical"
-- 
cgit v1.2.3