Fix realm issues (#1819)
* normalise Realm use consistent. * Fix for opensea querying * ensure key upgrade works correctly * Always show testnet messagepull/1826/head
parent
cb27462773
commit
f195a654ca
@ -1,122 +0,0 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:background="@color/colorPrimary" |
||||
android:orientation="vertical" |
||||
android:scrollbarAlwaysDrawVerticalTrack="true" |
||||
android:scrollbars="vertical"> |
||||
|
||||
<include |
||||
android:id="@+id/include3" |
||||
layout="@layout/layout_app_bar" /> |
||||
|
||||
<androidx.core.widget.NestedScrollView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:layout_below="@id/include3" > |
||||
|
||||
<LinearLayout |
||||
android:id="@+id/layout_list" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:background="@color/alabaster" |
||||
android:descendantFocusability="blocksDescendants" |
||||
android:orientation="vertical"> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
<FrameLayout |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content"> |
||||
|
||||
<TextView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="50dp" |
||||
android:background="@color/alabaster" |
||||
android:fontFamily="@font/font_semibold" |
||||
android:gravity="center_vertical" |
||||
android:paddingStart="16dp" |
||||
android:paddingEnd="16dp" |
||||
android:text="@string/mainnet" |
||||
android:textAllCaps="true" |
||||
android:textColor="@color/dove" |
||||
android:textSize="15sp" /> |
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial |
||||
android:id="@+id/mainnet_switch" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
android:clickable="true" |
||||
android:focusable="true" |
||||
android:layout_gravity="center_vertical|end" |
||||
android:theme="@style/SettingsItemSwitchAppearance" |
||||
android:visibility="visible" /> |
||||
|
||||
</FrameLayout> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
<androidx.recyclerview.widget.RecyclerView |
||||
android:id="@+id/main_list" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" /> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
<FrameLayout |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content"> |
||||
|
||||
<TextView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="50dp" |
||||
android:background="@color/alabaster" |
||||
android:fontFamily="@font/font_semibold" |
||||
android:gravity="center_vertical" |
||||
android:paddingStart="16dp" |
||||
android:paddingEnd="16dp" |
||||
android:text="@string/testnet" |
||||
android:textAllCaps="true" |
||||
android:textColor="@color/dove" |
||||
android:textSize="15sp" /> |
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial |
||||
android:id="@+id/testnet_switch" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:layout_marginEnd="16dp" |
||||
android:clickable="true" |
||||
android:focusable="true" |
||||
android:layout_gravity="center_vertical|end" |
||||
android:theme="@style/SettingsItemSwitchAppearance" |
||||
android:visibility="visible" /> |
||||
|
||||
</FrameLayout> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
<androidx.recyclerview.widget.RecyclerView |
||||
android:id="@+id/test_list" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:visibility="gone" /> |
||||
|
||||
</LinearLayout> |
||||
|
||||
</androidx.core.widget.NestedScrollView> |
||||
|
||||
</RelativeLayout> |
@ -0,0 +1,37 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:background="@color/colorPrimary" |
||||
android:orientation="vertical" |
||||
android:scrollbarAlwaysDrawVerticalTrack="true" |
||||
android:scrollbars="vertical"> |
||||
|
||||
<include layout="@layout/layout_app_bar" /> |
||||
|
||||
<LinearLayout |
||||
android:id="@+id/layout_list" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:layout_marginTop="?android:attr/actionBarSize" |
||||
android:background="@color/alabaster" |
||||
android:orientation="vertical"> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
<androidx.recyclerview.widget.RecyclerView |
||||
android:id="@+id/list" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" /> |
||||
|
||||
<View |
||||
android:layout_width="match_parent" |
||||
android:layout_height="1dp" |
||||
android:background="@color/mercury" /> |
||||
|
||||
</LinearLayout> |
||||
|
||||
</RelativeLayout> |
Loading…
Reference in new issue