Skip to content

Cleanup of settings and removed Logout button #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadam wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cleanup of settings and removed Logout button #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a0c718
Cleanup of settings and removed Logout button.
nadam Apr 19, 2015
91da008
Cleanup and removed chevrons to make it look less like an iOS app.
nadam Apr 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions AirBitz/airbitz/src/main/java/com/airbitz/adapters/TransactionAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
viewHolder = (ViewHolderItem) convertView.getTag();
}


if (0 == position && mListTransaction.size() == 1) {
convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_solo));
} else if (0 == position) {
convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_top_archive));
} else if (mListTransaction.size() - 1 == position) {
convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_bottom));
} else {
convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_standard));
}
convertView.setBackground(mContext.getResources().getDrawable(R.drawable.wallet_list_standard));

Transaction transaction = mListTransaction.get(position);

Expand Down
84 changes: 35 additions & 49 deletions AirBitz/airbitz/src/main/java/com/airbitz/fragments/settings/SettingFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.provider.Settings;
import android.util.Log;
import android.view.ContextThemeWrapper;
Expand All @@ -60,7 +59,6 @@
import android.widget.NumberPicker;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import android.widget.Switch;
import android.widget.TextView;

Expand All @@ -72,13 +70,11 @@
import com.airbitz.api.core;
import com.airbitz.api.tABC_AccountSettings;
import com.airbitz.api.tABC_BitcoinDenomination;
import com.airbitz.api.tABC_CC;
import com.airbitz.fragments.BaseFragment;
import com.airbitz.fragments.HelpFragment;
import com.airbitz.fragments.login.SignUpFragment;
import com.airbitz.fragments.settings.twofactor.TwoFactorShowFragment;
import com.airbitz.objects.BleUtil;
import com.airbitz.objects.HighlightOnPressButton;
import com.airbitz.objects.HighlightOnPressImageButton;

import java.util.ArrayList;
Expand All @@ -105,9 +101,9 @@ public class SettingFragment extends BaseFragment {
AlertDialog mCurrencyDialog;
AlertDialog mDefaultExchangeDialog;
AlertDialog mDistanceDialog;
private RelativeLayout mCategoryContainer;
private RelativeLayout mSpendingLimitContainer;
private RelativeLayout mTwoFactorContainer;
private Button mCategoryButton;
private Button mSpendingLimitButton;
private Button mTwoFactorButton;
private View mNFCSwitchLayout;
private View mBLESwitchLayout;
private HighlightOnPressImageButton mHelpButton;
Expand All @@ -116,9 +112,9 @@ public class SettingFragment extends BaseFragment {
private RadioButton mBitcoinButton;
private RadioButton mmBitcoinButton;
private RadioButton muBitcoinButton;
private HighlightOnPressButton mChangePasswordButton;
private HighlightOnPressButton mChangePINButton;
private HighlightOnPressButton mChangeRecoveryButton;
private Button mChangePasswordButton;
private Button mChangePINButton;
private Button mChangeRecoveryButton;
private Switch mSendNameSwitch;
private Switch mMerchantModeSwitch;
private Switch mPinReloginSwitch;
Expand All @@ -127,17 +123,16 @@ public class SettingFragment extends BaseFragment {
private EditText mFirstEditText;
private EditText mLastEditText;
private EditText mNicknameEditText;
private HighlightOnPressButton mAutoLogoffButton;
private HighlightOnPressButton mDebugButton;
private HighlightOnPressButton mDefaultCurrencyButton;
private HighlightOnPressButton mDefaultDistanceButton;
private Button mAutoLogoffButton;
private Button mDebugButton;
private Button mDefaultCurrencyButton;
private Button mDefaultDistanceButton;
private TextView mAccountTitle;
private HighlightOnPressButton mUSDollarButton;
private HighlightOnPressButton mCanadianDollarButton;
private HighlightOnPressButton mEuroButton;
private HighlightOnPressButton mPesoButton;
private HighlightOnPressButton mYuanButton;
private HighlightOnPressButton mLogoutButton;
private Button mUSDollarButton;
private Button mCanadianDollarButton;
private Button mEuroButton;
private Button mPesoButton;
private Button mYuanButton;
private AutoLogoffDialogManager mAutoLogoffManager;
private String[] mCurrencyItems;
private String[] mDistanceItems;
Expand Down Expand Up @@ -190,34 +185,25 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
}
});

mChangePasswordButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_change_password);
mChangePINButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_pin);
mChangeRecoveryButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_recovery);
mChangePasswordButton = (Button) mView.findViewById(R.id.settings_button_change_password);
mChangePINButton = (Button) mView.findViewById(R.id.settings_button_pin);
mChangeRecoveryButton = (Button) mView.findViewById(R.id.settings_button_recovery);

mFirstEditText = (EditText) mView.findViewById(R.id.settings_edit_first_name);
mLastEditText = (EditText) mView.findViewById(R.id.settings_edit_last_name);
mNicknameEditText = (EditText) mView.findViewById(R.id.settings_edit_nick_name);
mAutoLogoffButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_auto_logoff);
mAutoLogoffButton = (Button) mView.findViewById(R.id.settings_button_auto_logoff);
mAutoLogoffManager = new AutoLogoffDialogManager(mAutoLogoffButton, getActivity());
mDefaultCurrencyButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_currency);
mDefaultDistanceButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_distance);
mDefaultCurrencyButton = (Button) mView.findViewById(R.id.settings_button_currency);
mDefaultDistanceButton = (Button) mView.findViewById(R.id.settings_button_distance);

mUSDollarButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_usd);
mCanadianDollarButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_canadian);
mEuroButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_euro);
mPesoButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_peso);
mYuanButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_yuan);
mUSDollarButton = (Button) mView.findViewById(R.id.settings_button_usd);
mCanadianDollarButton = (Button) mView.findViewById(R.id.settings_button_canadian);
mEuroButton = (Button) mView.findViewById(R.id.settings_button_euro);
mPesoButton = (Button) mView.findViewById(R.id.settings_button_peso);
mYuanButton = (Button) mView.findViewById(R.id.settings_button_yuan);

mLogoutButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_logout);
mLogoutButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
saveCurrentSettings();
((NavigationActivity) getActivity()).Logout(false);
}
});

mDebugButton = (HighlightOnPressButton) mView.findViewById(R.id.settings_button_debug);
mDebugButton = (Button) mView.findViewById(R.id.settings_button_debug);
mDebugButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand All @@ -226,26 +212,26 @@ public void onClick(View view) {
}
});

mCategoryContainer = (RelativeLayout) mView.findViewById(R.id.category_container);
mCategoryContainer.setOnClickListener(new View.OnClickListener() {
mCategoryButton = (Button) mView.findViewById(R.id.settings_button_category);
mCategoryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Fragment fragment = new CategoryFragment();
((NavigationActivity) getActivity()).pushFragment(fragment, NavigationActivity.Tabs.MORE.ordinal());
}
});

mSpendingLimitContainer = (RelativeLayout) mView.findViewById(R.id.settings_spending_limits_container);
mSpendingLimitContainer.setOnClickListener(new View.OnClickListener() {
mSpendingLimitButton = (Button) mView.findViewById(R.id.settings_button_spending_limits);
mSpendingLimitButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Fragment fragment = new SpendingLimitsFragment();
((NavigationActivity) getActivity()).pushFragment(fragment, NavigationActivity.Tabs.MORE.ordinal());
}
});

mTwoFactorContainer = (RelativeLayout) mView.findViewById(R.id.settings_two_factor_container);
mTwoFactorContainer.setOnClickListener(new View.OnClickListener() {
mTwoFactorButton = (Button) mView.findViewById(R.id.settings_button_two_factor_authentication);
mTwoFactorButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Fragment fragment = new TwoFactorShowFragment();
Expand Down Expand Up @@ -752,13 +738,13 @@ static class AutoLogoffDialogManager {
private int mNumberSelection;
private int mTextSelection;
private AlertDialog mDialog;
private Button mButton;
private TextView mButton;
private Activity mActivity;
private int mMinutes;
private NumberPicker mNumberPicker;
private NumberPicker mTextPicker;

AutoLogoffDialogManager(Button button, Activity activity) {
AutoLogoffDialogManager(TextView button, Activity activity) {
this.mButton = button;
this.mActivity = activity;
mAutoLogoffStrings.add(mActivity.getString(R.string.settings_days));
Expand Down
7 changes: 7 additions & 0 deletions AirBitz/airbitz/src/main/res/color/listitem_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/listitem_normal"
android:state_pressed="false"
android:state_focused="false"/>
<item android:color="@color/selected_highlight" /> <!-- pressed or focused-->
</selector>
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:right=".5dp"
android:top=".5dp">
<shape>
<solid android:color="@color/listitem_normal" />
<solid android:color="@color/listitem_background" />
<corners
android:bottomLeftRadius="6dp"
android:bottomRightRadius="6dp" />
Expand Down
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_solo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item>

<shape>
<solid android:color="@color/listitem_normal" />
<solid android:color="@color/listitem_background" />
<corners android:radius="6dp" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_solo_archived.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:right=".5dp"
android:top=".5dp">
<shape>
<solid android:color="@color/listitem_normal" />
<solid android:color="@color/listitem_background" />
<corners android:radius="6dp" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_standard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:right=".5dp"
android:top=".5dp">
<shape>
<solid android:color="@color/listitem_normal" />
<solid android:color="@color/listitem_background" />
</shape>
</item>
</layer-list>
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:right=".5dp"
android:top=".5dp">
<shape>
<solid android:color="@color/blue_highlight" />
<solid android:color="@color/listitem_background" />
<corners
android:topLeftRadius="6dp"
android:topRightRadius="6dp" />
Expand Down
2 changes: 1 addition & 1 deletion AirBitz/airbitz/src/main/res/drawable/wallet_list_top_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:right=".5dp"
android:top=".5dp">
<shape>
<solid android:color="@color/listitem_normal" />
<solid android:color="@color/listitem_background" />
<corners
android:topLeftRadius="6dp"
android:topRightRadius="6dp" />
Expand Down
Loading