Added below banner to SettingsActivity

This commit is contained in:
Severiano Jaramillo 2018-01-17 22:15:50 -06:00
parent a8f93ada9b
commit 3b757ad55e
7 changed files with 372 additions and 267 deletions

View file

@ -21,6 +21,7 @@ import cy.agorise.crystalwallet.fragments.AccountsSettingsFragment;
import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment; import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
import cy.agorise.crystalwallet.fragments.BalanceFragment; import cy.agorise.crystalwallet.fragments.BalanceFragment;
import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment; import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
import cy.agorise.crystalwallet.fragments.SecuritySettingsFragment;
/** /**
* Created by seven on 12/28/17. * Created by seven on 12/28/17.
@ -91,6 +92,7 @@ public class SettingsActivity extends AppCompatActivity{
case 0: case 0:
return new GeneralSettingsFragment(); return new GeneralSettingsFragment();
case 1: case 1:
return new SecuritySettingsFragment();
case 2: case 2:
return new BackupsSettingsFragment(); return new BackupsSettingsFragment();
case 3: case 3:

View file

@ -0,0 +1,38 @@
package cy.agorise.crystalwallet.fragments;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import butterknife.ButterKnife;
import cy.agorise.crystalwallet.R;
/**
* Created by xd on 1/17/18.
*/
public class SecuritySettingsFragment extends Fragment {
public SecuritySettingsFragment() {
// Required empty public constructor
}
public static SecuritySettingsFragment newInstance() {
SecuritySettingsFragment fragment = new SecuritySettingsFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View v = inflater.inflate(R.layout.fragment_security_settings, container, false);
ButterKnife.bind(this, v);
return v;
}
}

View file

@ -12,7 +12,6 @@
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="120dp"
android:fitsSystemWindows="true"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
app:theme="@style/AppTheme.AppBarOverlay"> app:theme="@style/AppTheme.AppBarOverlay">
@ -20,7 +19,6 @@
android:id="@+id/toolbar_layout" android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:contentScrim="@color/transparent" app:contentScrim="@color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed" app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:toolbarId="@+id/toolbar"> app:toolbarId="@+id/toolbar">
@ -125,11 +123,57 @@
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<!-- change height --> <RelativeLayout
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> android:layout_marginBottom="?attr/actionBarSize"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/clBottomBanner"/>
<android.support.constraint.ConstraintLayout
android:id="@+id/clBottomBanner"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:background="@color/gray">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="v2.0.0"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="block# 14966596"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="8dp"
android:src="@drawable/icon_connecting"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

View file

@ -1,106 +1,114 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <android.support.constraint.ConstraintLayout
android:id="@+id/tvUpgrade" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:paddingBottom="20dp">
android:layout_marginEnd="32dp"
android:layout_marginTop="32dp"
android:text="@string/upgrade_description"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<Button <TextView
android:id="@+id/btnUpgrade" android:id="@+id/tvUpgrade"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginStart="32dp"
style="@style/Widget.Button" android:layout_marginEnd="32dp"
android:text="@string/upgrade" android:layout_marginTop="32dp"
android:textStyle="bold" android:text="@string/upgrade_description"
android:textColor="@color/white" android:textSize="15sp"
android:background="@color/colorPrimary" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvUpgrade" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="@id/tvUpgrade" /> app:layout_constraintEnd_toEndOf="parent"/>
<TextView <Button
android:id="@+id/tvImport" android:id="@+id/btnUpgrade"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="16dp"
android:text="@string/import_description" style="@style/Widget.Button"
android:textSize="15sp" android:text="@string/upgrade"
app:layout_constraintStart_toStartOf="@id/tvUpgrade" android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/btnUpgrade" android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="@id/tvUpgrade"/> android:background="@color/colorPrimary"
app:layout_constraintTop_toBottomOf="@id/tvUpgrade"
app:layout_constraintStart_toStartOf="@id/tvUpgrade" />
<Button <TextView
android:id="@+id/btnImport" android:id="@+id/tvImport"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="24dp"
style="@style/Widget.Button" android:text="@string/import_description"
android:text="@string/import_" android:textSize="15sp"
android:textStyle="bold" app:layout_constraintStart_toStartOf="@id/tvUpgrade"
android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@id/btnUpgrade"
android:background="@color/colorPrimary" app:layout_constraintEnd_toEndOf="@id/tvUpgrade"/>
app:layout_constraintTop_toBottomOf="@id/tvImport"
app:layout_constraintStart_toStartOf="@id/btnUpgrade" />
<TextView <Button
android:id="@+id/tvRefresh" android:id="@+id/btnImport"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="16dp"
android:text="@string/refresh_description" style="@style/Widget.Button"
android:textSize="15sp" android:text="@string/import_"
app:layout_constraintStart_toStartOf="@id/tvImport" android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/btnImport" android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="@id/tvImport"/> android:background="@color/colorPrimary"
app:layout_constraintTop_toBottomOf="@id/tvImport"
app:layout_constraintStart_toStartOf="@id/btnUpgrade" />
<Button <TextView
android:id="@+id/btnRefresh" android:id="@+id/tvRefresh"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="24dp"
style="@style/Widget.Button" android:text="@string/refresh_description"
android:text="@string/refresh" android:textSize="15sp"
android:textStyle="bold" app:layout_constraintStart_toStartOf="@id/tvImport"
android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@id/btnImport"
android:background="@color/colorPrimary" app:layout_constraintEnd_toEndOf="@id/tvImport"/>
app:layout_constraintTop_toBottomOf="@id/tvRefresh"
app:layout_constraintStart_toStartOf="@id/btnImport" />
<TextView <Button
android:id="@+id/tvRemove" android:id="@+id/btnRefresh"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="24dp" android:layout_marginTop="16dp"
android:text="@string/remove_description" style="@style/Widget.Button"
android:textSize="15sp" android:text="@string/refresh"
app:layout_constraintStart_toStartOf="@id/tvRefresh" android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/btnRefresh" android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="@id/tvRefresh"/> android:background="@color/colorPrimary"
app:layout_constraintTop_toBottomOf="@id/tvRefresh"
app:layout_constraintStart_toStartOf="@id/btnImport" />
<Button <TextView
android:id="@+id/btnRemove" android:id="@+id/tvRemove"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="24dp"
style="@style/Widget.Button" android:text="@string/remove_description"
android:text="@string/remove" android:textSize="15sp"
android:textStyle="bold" app:layout_constraintStart_toStartOf="@id/tvRefresh"
android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@id/btnRefresh"
android:background="@color/redcolor" app:layout_constraintEnd_toEndOf="@id/tvRefresh"/>
app:layout_constraintTop_toBottomOf="@id/tvRemove"
app:layout_constraintStart_toStartOf="@id/btnRefresh" />
</android.support.constraint.ConstraintLayout> <Button
android:id="@+id/btnRemove"
style="@style/Widget.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@color/redcolor"
android:text="@string/remove"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/btnRefresh"
app:layout_constraintTop_toBottomOf="@id/tvRemove" />
</android.support.constraint.ConstraintLayout>
</ScrollView>

View file

@ -1,193 +1,199 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <android.support.constraint.ConstraintLayout
android:id="@+id/tvBackupAsset"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:text="Backup Asset"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Spinner
android:id="@+id/spBackupAsset"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tvBackupAsset"
app:layout_constraintTop_toBottomOf="@id/tvBackupAsset" />
<View
android:id="@+id/vBackupAsset"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:background="@color/gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spBackupAsset" />
<TextView
android:id="@+id/tvTaxableCountry"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:paddingBottom="20dp">
android:text="Taxable Country"
app:layout_constraintTop_toBottomOf="@id/vBackupAsset"
app:layout_constraintStart_toStartOf="@id/tvBackupAsset"/>
<Spinner <TextView
android:id="@+id/spTaxableCountry" android:id="@+id/tvBackupAsset"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginStart="32dp"
app:layout_constraintTop_toBottomOf="@+id/tvTaxableCountry" android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="@id/spBackupAsset" android:text="Backup Asset"
app:layout_constraintEnd_toEndOf="@id/spBackupAsset"/> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View <Spinner
android:id="@+id/vTaxableCountry" android:id="@+id/spBackupAsset"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@color/gray" android:layout_marginEnd="32dp"
app:layout_constraintTop_toBottomOf="@id/spTaxableCountry" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/vBackupAsset" app:layout_constraintStart_toStartOf="@+id/tvBackupAsset"
app:layout_constraintEnd_toEndOf="@id/vBackupAsset"/> app:layout_constraintTop_toBottomOf="@id/tvBackupAsset" />
<TextView <View
android:id="@+id/tvPreferredLanguage" android:id="@+id/vBackupAsset"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="16dp" android:layout_marginEnd="32dp"
android:text="Preferred Language" android:layout_marginStart="32dp"
app:layout_constraintStart_toStartOf="@id/tvTaxableCountry" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/vTaxableCountry"/> android:background="@color/gray"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/spBackupAsset" />
<Spinner <TextView
android:id="@+id/spPreferredLanguage" android:id="@+id/tvTaxableCountry"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/tvPreferredLanguage" android:text="Taxable Country"
app:layout_constraintStart_toStartOf="@id/spTaxableCountry" app:layout_constraintTop_toBottomOf="@id/vBackupAsset"
app:layout_constraintEnd_toEndOf="@id/spTaxableCountry"/> app:layout_constraintStart_toStartOf="@id/tvBackupAsset"/>
<View <Spinner
android:id="@+id/vPreferredLanguage" android:id="@+id/spTaxableCountry"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@color/gray" app:layout_constraintTop_toBottomOf="@+id/tvTaxableCountry"
app:layout_constraintTop_toBottomOf="@id/spPreferredLanguage" app:layout_constraintStart_toStartOf="@id/spBackupAsset"
app:layout_constraintStart_toStartOf="@id/vTaxableCountry" app:layout_constraintEnd_toEndOf="@id/spBackupAsset"/>
app:layout_constraintEnd_toEndOf="@id/vTaxableCountry"/>
<TextView <View
android:id="@+id/tvDisplayDateTime" android:id="@+id/vTaxableCountry"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="16dp" android:layout_marginTop="8dp"
android:text="Display Dates and Times as" android:background="@color/gray"
app:layout_constraintTop_toBottomOf="@id/vPreferredLanguage" app:layout_constraintTop_toBottomOf="@id/spTaxableCountry"
app:layout_constraintStart_toStartOf="@id/tvPreferredLanguage"/> app:layout_constraintStart_toStartOf="@id/vBackupAsset"
app:layout_constraintEnd_toEndOf="@id/vBackupAsset"/>
<Spinner <TextView
android:id="@+id/spDisplayDateTime" android:id="@+id/tvPreferredLanguage"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/tvDisplayDateTime" android:text="Preferred Language"
app:layout_constraintStart_toStartOf="@id/spPreferredLanguage" app:layout_constraintStart_toStartOf="@id/tvTaxableCountry"
app:layout_constraintEnd_toEndOf="@id/spPreferredLanguage"/> app:layout_constraintTop_toBottomOf="@id/vTaxableCountry"/>
<View <Spinner
android:id="@+id/vDisplayDateTime" android:id="@+id/spPreferredLanguage"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@color/gray" app:layout_constraintTop_toBottomOf="@id/tvPreferredLanguage"
app:layout_constraintTop_toBottomOf="@id/spDisplayDateTime" app:layout_constraintStart_toStartOf="@id/spTaxableCountry"
app:layout_constraintStart_toStartOf="@id/vPreferredLanguage" app:layout_constraintEnd_toEndOf="@id/spTaxableCountry"/>
app:layout_constraintEnd_toEndOf="@id/vPreferredLanguage"/>
<TextView <View
android:id="@+id/tvSound" android:id="@+id/vPreferredLanguage"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="16dp" android:layout_marginTop="8dp"
android:text="Funds Received Sound" android:background="@color/gray"
app:layout_constraintTop_toBottomOf="@id/vDisplayDateTime" app:layout_constraintTop_toBottomOf="@id/spPreferredLanguage"
app:layout_constraintStart_toStartOf="@id/tvDisplayDateTime" /> app:layout_constraintStart_toStartOf="@id/vTaxableCountry"
app:layout_constraintEnd_toEndOf="@id/vTaxableCountry"/>
<Spinner <TextView
android:id="@+id/spSound" android:id="@+id/tvDisplayDateTime"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/tvSound" android:text="Display Dates and Times as"
app:layout_constraintStart_toStartOf="@id/spDisplayDateTime" app:layout_constraintTop_toBottomOf="@id/vPreferredLanguage"
app:layout_constraintEnd_toEndOf="@id/spDisplayDateTime"/> app:layout_constraintStart_toStartOf="@id/tvPreferredLanguage"/>
<View <Spinner
android:id="@+id/vSound" android:id="@+id/spDisplayDateTime"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@color/gray" app:layout_constraintTop_toBottomOf="@id/tvDisplayDateTime"
app:layout_constraintTop_toBottomOf="@id/spSound" app:layout_constraintStart_toStartOf="@id/spPreferredLanguage"
app:layout_constraintStart_toStartOf="@id/vDisplayDateTime" app:layout_constraintEnd_toEndOf="@id/spPreferredLanguage"/>
app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
<TextView <View
android:id="@+id/tvCloseWalletTimer" android:id="@+id/vDisplayDateTime"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="32dp" android:layout_marginTop="8dp"
android:text="Close wallet after 3 min. of inactivity" android:background="@color/gray"
android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/spDisplayDateTime"
android:textStyle="bold" app:layout_constraintStart_toStartOf="@id/vPreferredLanguage"
app:layout_constraintTop_toBottomOf="@id/vSound" app:layout_constraintEnd_toEndOf="@id/vPreferredLanguage"/>
app:layout_constraintStart_toStartOf="@id/spSound" />
<Switch <TextView
android:id="@+id/sCloseWalletTimer" android:id="@+id/tvSound"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@+id/tvCloseWalletTimer" android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="@id/vSound" /> android:text="Funds Received Sound"
app:layout_constraintTop_toBottomOf="@id/vDisplayDateTime"
app:layout_constraintStart_toStartOf="@id/tvDisplayDateTime" />
<TextView <Spinner
android:id="@+id/tvBugsErrors" android:id="@+id/spSound"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp" android:layout_marginTop="8dp"
android:text="Bugs or Errors? Let us know" app:layout_constraintTop_toBottomOf="@id/tvSound"
android:textSize="14sp" app:layout_constraintStart_toStartOf="@id/spDisplayDateTime"
android:textStyle="bold" app:layout_constraintEnd_toEndOf="@id/spDisplayDateTime"/>
app:layout_constraintStart_toStartOf="@id/tvCloseWalletTimer"
app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"/>
<Button <View
android:layout_width="wrap_content" android:id="@+id/vSound"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginTop="30dp" android:layout_height="1dp"
android:text="CONTACT" android:layout_marginTop="8dp"
android:textStyle="bold" android:background="@color/gray"
android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@id/spSound"
android:background="@color/colorPrimary" app:layout_constraintStart_toStartOf="@id/vDisplayDateTime"
app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer" app:layout_constraintEnd_toEndOf="@id/vDisplayDateTime"/>
app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer" />
</android.support.constraint.ConstraintLayout> <TextView
android:id="@+id/tvCloseWalletTimer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="Close wallet after 3 min. of inactivity"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/vSound"
app:layout_constraintStart_toStartOf="@id/spSound" />
<Switch
android:id="@+id/sCloseWalletTimer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@+id/tvCloseWalletTimer"
app:layout_constraintEnd_toEndOf="@id/vSound" />
<TextView
android:id="@+id/tvBugsErrors"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:text="Bugs or Errors? Let us know"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tvCloseWalletTimer"
app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:background="@color/colorPrimary"
android:text="CONTACT"
android:textColor="@color/white"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer"
app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer" />
</android.support.constraint.ConstraintLayout>
</ScrollView>

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</android.support.constraint.ConstraintLayout>

View file

@ -482,7 +482,7 @@
<string name="upgrade">Upgrade</string> <string name="upgrade">Upgrade</string>
<string name="import_description">Import Accounts. Import multiple accounts from blockchains such as Bitshares, Bitcoin, Steem, Dash and more.</string> <string name="import_description">Import Accounts. Import multiple accounts from blockchains such as Bitshares, Bitcoin, Steem, Dash and more.</string>
<string name="import_">Import</string> <string name="import_">Import</string>
<string name="refresh_description">Refresh keys. Ony for bithsares accounts.</string> <string name="refresh_description">Refresh keys. Ony for bitshares accounts.</string>
<string name="refresh">Refresh</string> <string name="refresh">Refresh</string>
<string name="remove_description">Remove an account from this Wallet. The account removed will still reside on the blockchain.</string> <string name="remove_description">Remove an account from this Wallet. The account removed will still reside on the blockchain.</string>
<string name="remove">Remove</string> <string name="remove">Remove</string>