diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java index 70f68aa..222c74a 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java @@ -84,11 +84,6 @@ public class SettingsActivity extends AppCompatActivity{ mPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mPager)); - - // Automatically get build version from app information - String buildVersion = "v"; - buildVersion += BuildConfig.VERSION_NAME; - tvBuildVersion.setText(buildVersion); } private class SettingsPagerAdapter extends FragmentStatePagerAdapter { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 484c17d..2e76881 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -125,47 +125,13 @@ android:id="@+id/pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@id/clBottomBanner"/> + android:layout_above="@id/bottomStatusBar"/> - - - - - - - - - + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"/> diff --git a/app/src/main/res/layout/create_seed.xml b/app/src/main/res/layout/create_seed.xml index 1958f75..7a8b7cd 100644 --- a/app/src/main/res/layout/create_seed.xml +++ b/app/src/main/res/layout/create_seed.xml @@ -89,7 +89,7 @@ android:text="@string/cancel" android:textColor="@color/white" android:textStyle="bold" - app:layout_constraintBottom_toTopOf="@+id/linearLayout" + app:layout_constraintBottom_toTopOf="@+id/bottomStatusBar" app:layout_constraintStart_toStartOf="@id/tilAccountName" app:layout_constraintTop_toBottomOf="@+id/tilAccountName" /> @@ -106,7 +106,7 @@ android:textStyle="bold" app:layout_constraintEnd_toEndOf="@id/tilAccountName" app:layout_constraintTop_toTopOf="@id/btnCancel" /> - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 46b8d4e..37e81e9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -498,4 +498,5 @@ Pattern New user? Existing user? + Connection status