account: put settings button in Toolbar
Having the Advanced settings button in the content fragment was not very
practical since an access to the parent activity was done to display the
advanced setting screen
Tuleap: #1218
Change-Id: Iddb51e4779ca38a0f7afbefbac679b30fcffb12b
diff --git a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
index 0f45cae..16f9550 100644
--- a/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
+++ b/ring-android/app/src/main/java/cx/ring/client/AccountEditionActivity.java
@@ -218,12 +218,6 @@
}
}
-
- public void editAdvanced() {
- mSlidingTabLayout.setVisibility(View.VISIBLE);
- mViewPager.setVisibility(View.VISIBLE);
- }
-
private void finishAdvanced() {
mSlidingTabLayout.setVisibility(View.GONE);
mViewPager.setVisibility(View.GONE);
@@ -272,6 +266,10 @@
AlertDialog deleteDialog = createDeleteDialog();
deleteDialog.show();
break;
+ case R.id.menuitem_advanced:
+ mSlidingTabLayout.setVisibility(View.VISIBLE);
+ mViewPager.setVisibility(View.VISIBLE);
+ break;
default:
break;
}
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/DeviceAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/DeviceAccountFragment.java
index 09f519f..394adae 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/DeviceAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/DeviceAccountFragment.java
@@ -56,7 +56,6 @@
import butterknife.OnClick;
import butterknife.OnEditorAction;
import cx.ring.R;
-import cx.ring.client.AccountEditionActivity;
import cx.ring.interfaces.AccountCallbacks;
import cx.ring.interfaces.AccountChangedListener;
import cx.ring.interfaces.BackHandlerInterface;
@@ -92,9 +91,6 @@
@BindView(R.id.account_link_info)
TextView mExportInfos;
- @BindView(R.id.account_edit_btn)
- View mEditBtn;
-
@BindView(R.id.account_alias_txt)
TextView mAccountNameTxt;
@@ -424,10 +420,4 @@
return devLayout;
}
-
- @OnClick(R.id.account_edit_btn)
- public void editAccount() {
- ((AccountEditionActivity) getActivity()).editAdvanced();
- }
-
}
diff --git a/ring-android/app/src/main/res/layout/frag_device_list.xml b/ring-android/app/src/main/res/layout/frag_device_list.xml
index 962742e..3417505 100644
--- a/ring-android/app/src/main/res/layout/frag_device_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_device_list.xml
@@ -41,33 +41,17 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <LinearLayout
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/account_alias_txt"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/account_alias_txt"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingBottom="8dp"
- android:paddingEnd="16dp"
- android:paddingStart="16dp"
- android:paddingTop="24dp"
- android:text="@string/ring_account"
- android:textAppearance="@style/Base.TextAppearance.AppCompat.Large" />
-
- <ImageButton
- android:id="@+id/account_edit_btn"
- style="@style/Widget.AppCompat.Button.Borderless"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:background="?selectableItemBackgroundBorderless"
- app:srcCompat="@drawable/ic_settings_black" />
-
- </LinearLayout>
+ android:layout_weight="1"
+ android:paddingBottom="8dp"
+ android:paddingEnd="16dp"
+ android:paddingStart="16dp"
+ android:paddingTop="24dp"
+ android:text="@string/ring_account"
+ android:textAppearance="@style/Base.TextAppearance.AppCompat.Large" />
<TextView
android:id="@+id/account_id_txt"
@@ -161,15 +145,15 @@
style="@style/Base.TextAppearance.AppCompat.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
android:paddingBottom="16dp"
android:paddingEnd="8dp"
android:paddingLeft="16dp"
android:paddingRight="8dp"
android:paddingStart="16dp"
android:paddingTop="4dp"
- tools:text="Wagaf"
android:textAlignment="viewStart"
- android:layout_gravity="start"/>
+ tools:text="blockchain_name" />
</LinearLayout>
<TextView
diff --git a/ring-android/app/src/main/res/menu/account_edition.xml b/ring-android/app/src/main/res/menu/account_edition.xml
index 5eab491..1aabf5c 100644
--- a/ring-android/app/src/main/res/menu/account_edition.xml
+++ b/ring-android/app/src/main/res/menu/account_edition.xml
@@ -5,7 +5,13 @@
<item
android:id="@+id/menuitem_delete"
android:icon="@drawable/ic_delete_white"
- android:title="@string/ab_account_edition_1"
+ android:title="@string/ic_delete_menu"
+ app:showAsAction="ifRoom"/>
+
+ <item
+ android:id="@+id/menuitem_advanced"
+ android:icon="@drawable/ic_settings_white"
+ android:title="@string/ic_advanced_menu"
app:showAsAction="ifRoom"/>
</menu>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index 2d6807e..1d3e7cd 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -20,6 +20,10 @@
<resources>
+ <!-- Strings related to account edition screen -->
+ <string name="ic_delete_menu">Delete</string>
+ <string name="ic_advanced_menu">Advanced settings</string>
+
<!-- Strings related to account creation -->
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Hostname</string>