summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/views/SelectLocationEntry.java3
-rw-r--r--app/src/main/res/layout/v_select_text_list_item.xml180
2 files changed, 91 insertions, 92 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/SelectLocationEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/SelectLocationEntry.java
index bf293a51..204e8692 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/SelectLocationEntry.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/SelectLocationEntry.java
@@ -5,6 +5,7 @@ import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import androidx.appcompat.widget.AppCompatImageView;
@@ -15,7 +16,7 @@ import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.models.Location;
import se.leap.bitmaskclient.eip.GatewaysManager.Load;
-public class SelectLocationEntry extends RelativeLayout {
+public class SelectLocationEntry extends LinearLayout {
private static final String TAG = SelectLocationEntry.class.getSimpleName();
AppCompatTextView title;
diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml
index a6f78b3f..44e82906 100644
--- a/app/src/main/res/layout/v_select_text_list_item.xml
+++ b/app/src/main/res/layout/v_select_text_list_item.xml
@@ -1,107 +1,105 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/item_container"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="horizontal"
+ android:orientation="vertical"
android:background="?attr/selectableItemBackground">
- <!-- views are composed right to left -->
-
- <se.leap.bitmaskclient.base.views.LocationIndicator
- android:id="@+id/quality"
- android:layout_width="30dp"
- android:layout_height="25dp"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_marginBottom="12dp"
- android:layout_marginLeft="@dimen/standard_margin"
- android:layout_marginRight="@dimen/standard_margin"
- tools:visibility="visible"
- android:visibility="visible"
- android:layout_alignBottom="@+id/location"
- />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/bridge_image"
- android:layout_width="wrap_content"
- android:layout_height="40dp"
- android:paddingBottom="5dp"
- android:scaleType="fitXY"
- android:layout_toStartOf="@id/quality"
- android:layout_toLeftOf="@id/quality"
- android:src="@drawable/ic_bridge_36"
- tools:visibility="visible"
- android:visibility="gone"
- android:layout_alignBottom="@+id/location"
- />
-
- <androidx.appcompat.widget.AppCompatTextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/selected"
- android:layout_toRightOf="@+id/selected"
- android:layout_toStartOf="@id/bridge_image"
- android:layout_toLeftOf="@id/bridge_image"
- android:layout_alignParentTop="true"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:paddingStart="@dimen/standard_margin"
- android:paddingLeft="@dimen/standard_margin"
- android:paddingEnd="@dimen/standard_margin"
- android:paddingRight="@dimen/standard_margin"
- android:paddingTop="10dp"
- android:textAppearance="?android:attr/textAppearanceListItemSmall"
- tools:text="this is an interesting text"
- android:visibility="gone"
- tools:visibility="gone"
- />
-
- <androidx.appcompat.widget.AppCompatTextView
- android:id="@+id/location"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toEndOf="@+id/selected"
- android:layout_toRightOf="@+id/selected"
- android:layout_toStartOf="@id/bridge_image"
- android:layout_toLeftOf="@id/bridge_image"
- android:layout_below="@id/title"
- android:ellipsize="end"
- android:gravity="center_vertical"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:paddingStart="@dimen/standard_margin"
- android:paddingLeft="@dimen/standard_margin"
- android:paddingEnd="@dimen/standard_margin"
- android:paddingRight="@dimen/standard_margin"
- android:paddingTop="8dp"
- android:textAppearance="?android:attr/textAppearanceListItem"
- android:textStyle="bold"
- tools:visibility="visible"
- android:visibility="visible"
- tools:text="Paris" />
-
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ >
+ <se.leap.bitmaskclient.base.views.SimpleCheckBox
+ android:id="@+id/selected"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:layout_marginStart="4dp"
+ android:layout_marginLeft="4dp"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_check_bold"
+ android:tint="@color/green200"
+ android:visibility="visible"
+ tools:visibility="visible" />
- <se.leap.bitmaskclient.base.views.SimpleCheckBox
- android:id="@+id/selected"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_marginStart="4dp"
- android:layout_marginLeft="4dp"
- android:layout_marginBottom="@dimen/stdpadding"
- android:layout_centerVertical="true"
- android:src="@drawable/ic_check_bold"
- android:tint="@color/green200"
- android:visibility="visible"
- tools:visibility="visible" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingEnd="@dimen/standard_margin"
+ android:paddingRight="@dimen/standard_margin"
+ android:paddingStart="@dimen/standard_margin"
+ android:paddingLeft="@dimen/standard_margin"
+ >
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:paddingTop="10dp"
+ android:textAppearance="?android:attr/textAppearanceListItemSmall"
+ tools:text="this is an interesting text"
+ android:visibility="gone"
+ tools:visibility="visible"
+ />
+ <LinearLayout
+ android:id="@+id/location_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:weightSum="1"
+ android:visibility="visible"
+ tools:visibility="visible"
+ >
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/location"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:paddingTop="8dp"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textStyle="bold"
+ tools:visibility="visible"
+ android:visibility="visible"
+ tools:text="Paris"
+ android:layout_weight="1"
+ />
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/bridge_image"
+ android:layout_width="wrap_content"
+ android:layout_height="32dp"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_bridge_36"
+ tools:visibility="visible"
+ android:visibility="visible"
+ android:layout_gravity="center_vertical"
+ />
+ <se.leap.bitmaskclient.base.views.LocationIndicator
+ android:id="@+id/quality"
+ android:layout_width="30dp"
+ android:layout_height="25dp"
+ android:layout_marginLeft="@dimen/standard_margin"
+ android:layout_marginRight="@dimen/standard_margin"
+ tools:visibility="visible"
+ android:visibility="visible"
+ android:gravity="center_vertical"
+ android:layout_gravity="center_vertical"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@android:color/darker_gray"
- android:layout_below="@id/location"
+ android:layout_marginTop="@dimen/stdpadding"
android:visibility="visible"
/>
-</RelativeLayout>
+</LinearLayout>