status-im
/
syng-client
mirror of https://github.com/status-im/syng-client.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:syng-io/syng-client

This commit is contained in:
Jarrad Hope 2015-09-02 16:22:20 +02:00
parent 8bafc4da2f 003dfea442
commit 1cee37e123
4 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/io/syng/activity/BaseActivity.java
View File

@ -131,7 +131,6 @@ public abstract class BaseActivity extends AppCompatActivity implements
mSearchTextView = (EditText) findViewById(R.id.search);
initSearch();
findViewById(R.id.ll_import_wallet).setOnClickListener(this);
findViewById(R.id.ll_settings).setOnClickListener(this);
findViewById(R.id.ll_contribute).setOnClickListener(this);
findViewById(R.id.drawer_header_item).setOnClickListener(this);
@ -297,9 +296,6 @@ public abstract class BaseActivity extends AppCompatActivity implements
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.ll_import_wallet:
onProfileImport();
break;
case R.id.ll_contribute:
String url = CONTRIBUTE_LINK;
Intent intent = new Intent(Intent.ACTION_VIEW);
@ -364,12 +360,6 @@ public abstract class BaseActivity extends AppCompatActivity implements
}
}
@Override
public void onProfileImport() {
GeneralUtil.showProfileImportDialog(this);
}
@Override
public void onDAppEdit(final Dapp dapp) {
GeneralUtil.showDAppEditDialog(dapp, this);

2
app/src/main/java/io/syng/adapter/ProfileDrawerAdapter.java
View File

@ -43,8 +43,6 @@ public class ProfileDrawerAdapter extends RecyclerView.Adapter<RecyclerView.View
void onProfileEdit(Profile profile);
void onProfileImport();
void onProfileAdd();
}

25
app/src/main/java/io/syng/fragment/profile/ProfileDialogFragment.java
View File

@ -28,6 +28,7 @@ import android.view.Window;
import io.syng.R;
import io.syng.adapter.ProfileViewPagerAdapter;
import io.syng.entity.Profile;
import io.syng.util.GeneralUtil;
public class ProfileDialogFragment extends DialogFragment implements OnPageChangeListener,
OnClickListener {
@ -38,6 +39,8 @@ public class ProfileDialogFragment extends DialogFragment implements OnPageChang
private TabLayout mTabLayout;
private Toolbar mToolbar;
private String mProfileId;
private MenuItem importProfile;
private MenuItem exportProfile;
public static ProfileDialogFragment newInstance(final Profile profile) {
Bundle bundle = new Bundle();
@ -72,8 +75,26 @@ public class ProfileDialogFragment extends DialogFragment implements OnPageChang
mToolbar = (Toolbar) view.findViewById(R.id.profile_toolbar);
mToolbar.setTitle("Edit Profile");
mToolbar.inflateMenu(R.menu.profile_menu);
mToolbar.getMenu().findItem(R.id.action_key_export).setVisible(false);
mToolbar.getMenu().findItem(R.id.action_key_import).setVisible(false);
exportProfile = mToolbar.getMenu().findItem(R.id.action_key_export);
exportProfile.setVisible(false);
exportProfile.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem menuItem) {
return false;
}
});
importProfile = mToolbar.getMenu().findItem(R.id.action_key_import);
importProfile.setVisible(false);
importProfile.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem menuItem) {
GeneralUtil.showProfileImportDialog(getActivity());
return false;
}
});
mToolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp);
mToolbar.setNavigationOnClickListener(this);
tintMenuItem();

29
app/src/main/res/layout/drawer_bottom_part.xml
View File

@ -17,35 +17,6 @@
android:orientation="vertical"
>
<LinearLayout
android:id="@+id/ll_import_wallet"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_add_black_24dp"
android:tint="@color/drawer_icon_color"/>
<TextView
android:id="@+id/tv_import_wallet"
style="@style/Base.TextAppearance.AppCompat.Body2"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingLeft="32dp"
android:paddingStart="32dp"
android:text="Import Wallet"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_settings"
android:layout_width="match_parent"