agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added below banner to SettingsActivity

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
View file

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

38
app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java Normal file
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;
}
}

52
app/src/main/res/layout/activity_settings.xml
View file

@ -12,7 +12,6 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="120dp"
android:fitsSystemWindows="true"
android:background="@color/colorPrimary"
app:theme="@style/AppTheme.AppBarOverlay">
@ -20,7 +19,6 @@
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:contentScrim="@color/transparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:toolbarId="@+id/toolbar">
@ -125,11 +123,57 @@
</android.support.design.widget.AppBarLayout>
<!-- change height -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
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"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
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>

22
app/src/main/res/layout/fragment_accounts_settings.xml
View file

@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="20dp">
<TextView
android:id="@+id/tvUpgrade"
android:layout_width="0dp"
@ -92,15 +97,18 @@
<Button
android:id="@+id/btnRemove"
style="@style/Widget.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
style="@style/Widget.Button"
android:text="@string/remove"
android:textStyle="bold"
android:textColor="@color/white"
android:background="@color/redcolor"
app:layout_constraintTop_toBottomOf="@id/tvRemove"
app:layout_constraintStart_toStartOf="@id/btnRefresh" />
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>

20
app/src/main/res/layout/fragment_general_settings.xml
View file

@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="20dp">
<TextView
android:id="@+id/tvBackupAsset"
android:layout_width="wrap_content"
@ -183,11 +187,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="CONTACT"
android:textStyle="bold"
android:textColor="@color/white"
android:background="@color/colorPrimary"
app:layout_constraintTop_toBottomOf="@id/tvCloseWalletTimer"
app:layout_constraintEnd_toEndOf="@id/sCloseWalletTimer" />
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>

7
app/src/main/res/layout/fragment_security_settings.xml Normal file
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>

2
app/src/main/res/values/strings.xml
View file

@ -482,7 +482,7 @@
<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_">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="remove_description">Remove an account from this Wallet. The account removed will still reside on the blockchain.</string>
<string name="remove">Remove</string>