diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
index 5bc1c7f3b595e1514bd668b42d9b4dc0ac7de65e..903ec40ab42ad8cf9c7daa742afcb1eb15bc263e 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
+ * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
*
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
*
@@ -45,7 +45,6 @@ import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import cx.ring.service.LocalService;
-import cx.ring.views.PasswordEditText;
public class AccountCreationFragment extends Fragment {
static final String TAG = AccountCreationFragment.class.getSimpleName();
@@ -61,7 +60,7 @@ public class AccountCreationFragment extends Fragment {
private EditText mAliasView;
private EditText mHostnameView;
private EditText mUsernameView;
- private PasswordEditText mPasswordView;
+ private EditText mPasswordView;
private LocalService.Callbacks mCallbacks = LocalService.DUMMY_CALLBACKS;
@@ -77,9 +76,9 @@ public class AccountCreationFragment extends Fragment {
mAliasView = (EditText) inflatedView.findViewById(R.id.alias);
mHostnameView = (EditText) inflatedView.findViewById(R.id.hostname);
mUsernameView = (EditText) inflatedView.findViewById(R.id.username);
- mPasswordView = (PasswordEditText) inflatedView.findViewById(R.id.password);
+ mPasswordView = (EditText) inflatedView.findViewById(R.id.password);
- mPasswordView.getEdit_text().setOnEditorActionListener(new OnEditorActionListener() {
+ mPasswordView.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
mAccountType = "SIP";
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
index a25e6f163a8290f6108a0e3a76c1d47641e526fc..0a9c7ae69132e17e7c85f71531df83ff89012f84 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
@@ -175,7 +175,7 @@ public class AdvancedAccountFragment extends PreferenceFragment {
preference.getKey().contentEquals(AccountDetailAdvanced.CONFIG_AUDIO_PORT_MIN))
newValue = adjustRtpRange(Integer.valueOf((String) newValue));
- preference.setSummary((CharSequence) newValue);
+ preference.setSummary(newValue.toString());
mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), newValue.toString());
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java b/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
index 3b19d512ab8d3f523ca4251b5e0b143fd0b75649..4514898ad8a565487622b24fae9744202e974f8c 100644
--- a/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
+++ b/ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
@@ -57,7 +57,7 @@ import cx.ring.model.account.CredentialsManager;
public class CredentialsPreference extends DialogPreference {
EditText mUsernameField;
- PasswordEditText mPasswordField;
+ EditText mPasswordField;
EditText mRealmField;
public CredentialsPreference(Context context, AttributeSet attrs) {
@@ -72,13 +72,13 @@ public class CredentialsPreference extends DialogPreference {
View view = inflater.inflate(R.layout.credentials_pref, null);
mUsernameField = (EditText) view.findViewById(R.id.credentials_username);
- mPasswordField = (PasswordEditText) view.findViewById(R.id.credentials_password);
+ mPasswordField = (EditText) view.findViewById(R.id.credentials_password);
mRealmField = (EditText) view.findViewById(R.id.credentials_realm);
if (getExtras().getSerializable(CredentialsManager.CURRENT_CRED) != null) {
HashMap<String, String> details = (HashMap<String, String>) getExtras().getSerializable(CredentialsManager.CURRENT_CRED);
mUsernameField.setText(details.get(AccountCredentials.CONFIG_ACCOUNT_USERNAME));
- mPasswordField.getEdit_text().setText(details.get(AccountCredentials.CONFIG_ACCOUNT_PASSWORD));
+ mPasswordField.setText(details.get(AccountCredentials.CONFIG_ACCOUNT_PASSWORD));
mRealmField.setText(details.get(AccountCredentials.CONFIG_ACCOUNT_REALM));
}
diff --git a/ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java b/ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java
deleted file mode 100644
index a6c62f5ed2b0a15a0f85e6658d77966d0dac5fa5..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package cx.ring.views;
-
-import android.content.Context;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.text.method.HideReturnsTransformationMethod;
-import android.text.method.PasswordTransformationMethod;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.RelativeLayout;
-import cx.ring.R;
-
-/**
- * Created by lisional on 06/04/14.
- */
-public class PasswordEditText extends RelativeLayout {
- LayoutInflater inflater = null;
- EditText edit_text;
- Button btn_clear;
-
- public PasswordEditText(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- initViews();
- }
-
- public PasswordEditText(Context context, AttributeSet attrs) {
- super(context, attrs);
- initViews();
- }
-
- public PasswordEditText(Context context) {
- super(context);
- // TODO Auto-generated constructor stub
- initViews();
- }
-
- void initViews() {
- inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- inflater.inflate(R.layout.password_edittext, this, true);
- edit_text = (EditText) findViewById(R.id.password_edittext);
- edit_text.setSingleLine();
- edit_text.setImeOptions(EditorInfo.IME_ACTION_DONE);
- btn_clear = (Button) findViewById(R.id.password_visibility);
- btn_clear.setVisibility(RelativeLayout.INVISIBLE);
- revealText();
- edit_text.setTransformationMethod(PasswordTransformationMethod.getInstance());
- showHideClearButton();
- }
-
- void revealText() {
- btn_clear.setOnTouchListener(new View.OnTouchListener() {
- @Override
- public boolean onTouch(View v, MotionEvent event) {
- switch(event.getAction()) {
- case MotionEvent.ACTION_DOWN:
- edit_text.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
- edit_text.setSelection(edit_text.getText().length());
- return true; // if you want to handle the touch event
- case MotionEvent.ACTION_UP:
- // RELEASED
- edit_text.setTransformationMethod(PasswordTransformationMethod.getInstance());
- edit_text.setSelection(edit_text.getText().length());
- return true; // if you want to handle the touch event
- }
- return false;
- }
- });
- }
-
- void showHideClearButton() {
- edit_text.addTextChangedListener(new TextWatcher() {
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (s.length() > 0)
- btn_clear.setVisibility(RelativeLayout.VISIBLE);
- else
- btn_clear.setVisibility(RelativeLayout.INVISIBLE);
- }
-
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
- }
-
- @Override
- public void afterTextChanged(Editable s) {
- }
- });
- }
-
- public Editable getText() {
- Editable text = edit_text.getText();
- return text;
- }
-
- public void setInputType(int typeClassNumber) {
- edit_text.setFocusableInTouchMode(true);
- edit_text.requestFocus();
- edit_text.setInputType(typeClassNumber);
- }
-
- public EditText getEdit_text() {
- return edit_text;
- }
-
- public void setError(String string) {
- edit_text.setError(string);
- edit_text.requestFocus();
- }
-}
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/credentials_pref.xml b/ring-android/app/src/main/res/layout/credentials_pref.xml
index 8a7c57f7cf1dc8d147b13b761f98da96c7c863a4..ddb141913fc6812dabf7d28171bb3c05615bf92f 100644
--- a/ring-android/app/src/main/res/layout/credentials_pref.xml
+++ b/ring-android/app/src/main/res/layout/credentials_pref.xml
@@ -39,25 +39,26 @@ as that of the covered work.
android:id="@+id/credentials_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:hint="@string/account_username_label"
android:imeOptions="actionNext"
- android:inputType="textNoSuggestions"
- android:hint="Username..." >
-
+ android:inputType="textNoSuggestions" >
<requestFocus />
</EditText>
- <cx.ring.views.PasswordEditText
+ <EditText
android:id="@+id/credentials_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:imeOptions="actionNext" />
+ android:hint="@string/account_password_label"
+ android:imeOptions="actionNext"
+ android:inputType="textPassword" />
<EditText
android:id="@+id/credentials_realm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textNoSuggestions"
+ android:hint="Realm..."
android:imeOptions="actionGo"
- android:hint="Realm..." />
+ android:inputType="textNoSuggestions" />
</LinearLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_account_creation.xml b/ring-android/app/src/main/res/layout/frag_account_creation.xml
index 86ddb81bec354fc657c3c6b43d4217f38800803d..f84488d52c47edccaff6642ed2b9c76842b615e5 100644
--- a/ring-android/app/src/main/res/layout/frag_account_creation.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_creation.xml
@@ -22,211 +22,204 @@ along with this program; if not, write to the Free Software
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".client.AccountWizard"
- android:background="#eeeeee">
+ android:background="#eeeeee"
+ tools:context=".client.AccountWizard">
<LinearLayout
style="@style/AccountFormContainer"
- android:orientation="vertical"
android:descendantFocusability="beforeDescendants"
- android:focusableInTouchMode="true" >
+ android:focusableInTouchMode="true"
+ android:orientation="vertical">
- <android.support.v7.widget.CardView
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/ring_card_view"
- android:layout_gravity="center"
android:layout_width="280dp"
android:layout_height="wrap_content"
- card_view:cardCornerRadius="2dp"
- android:layout_marginBottom="8dp">
+ android:layout_gravity="center"
+ android:layout_marginBottom="8dp"
+ card_view:cardCornerRadius="2dp">
<RelativeLayout
- android:orientation="vertical"
+ android:id="@+id/ring_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:id="@+id/ring_fields">
+ android:orientation="vertical">
<ImageView
+ android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/imageView6"
- android:layout_alignParentTop="true"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:src="@drawable/ring_logo_48dp"
- android:layout_margin="16dp" />
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_margin="16dp"
+ android:src="@drawable/ring_logo_48dp" />
<TextView
+ android:id="@+id/ring_acc_title_txt"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/help_ring_title"
- android:singleLine="false"
- android:textColor="@color/text_color_primary"
- android:textSize="24sp"
- android:paddingLeft="16dp"
- android:paddingTop="24dp"
- android:paddingRight="16dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:id="@+id/ring_acc_title_txt"
android:layout_toLeftOf="@+id/imageView6"
- android:layout_toStartOf="@+id/imageView6" />
+ android:layout_toStartOf="@+id/imageView6"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="24dp"
+ android:singleLine="false"
+ android:text="@string/help_ring_title"
+ android:textColor="@color/text_color_primary"
+ android:textSize="24sp" />
<TextView
+ android:id="@+id/textView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/help_ring"
- android:id="@+id/textView"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/ring_acc_title_txt"
+ android:padding="16dp"
android:singleLine="false"
+ android:text="@string/help_ring"
android:textColor="@color/text_color_primary"
- android:padding="16dp"
- android:textSize="14sp"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/ring_acc_title_txt" />
+ android:textSize="14sp" />
<Button
android:id="@+id/create_ring_account"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/create_ring_account"
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
+ android:layout_alignParentEnd="false"
+ android:layout_alignParentStart="false"
+ android:layout_below="@+id/textView"
android:layout_margin="8dp"
android:padding="8dp"
- android:layout_below="@+id/textView"
- android:layout_alignParentStart="false"
- android:layout_alignParentEnd="false" />
+ android:text="@string/create_ring_account" />
</RelativeLayout>
</android.support.v7.widget.CardView>
- <android.support.v7.widget.CardView
- xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view"
- android:layout_gravity="center"
android:layout_width="280dp"
android:layout_height="wrap_content"
- card_view:cardCornerRadius="2dp"
- android:layout_margin="8dp">
+ android:layout_gravity="center"
+ android:layout_margin="8dp"
+ card_view:cardCornerRadius="2dp">
+
<RelativeLayout
- android:orientation="vertical"
+ android:id="@+id/sip_fields"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/sip_fields"
- android:nestedScrollingEnabled="false">
+ android:nestedScrollingEnabled="false"
+ android:orientation="vertical">
<TextView
+ android:id="@+id/textView3"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="@string/help_sip_title"
- android:singleLine="false"
- android:textColor="@color/text_color_primary"
- android:textSize="24sp"
- android:paddingTop="24dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:id="@+id/textView3"
android:layout_alignParentStart="false"
+ android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/imageView5"
- android:layout_toStartOf="@+id/imageView5" />
+ android:layout_toStartOf="@+id/imageView5"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="24dp"
+ android:singleLine="false"
+ android:text="@string/help_sip_title"
+ android:textColor="@color/text_color_primary"
+ android:textSize="24sp" />
<TextView
+ android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/help_sip"
- android:singleLine="false"
- android:textColor="@color/text_color_primary"
- android:textSize="14sp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentStart="true"
android:layout_below="@+id/textView3"
- android:id="@+id/textView4"
android:padding="16dp"
- android:layout_alignParentEnd="true"
- android:layout_alignParentStart="true" />
+ android:singleLine="false"
+ android:text="@string/help_sip"
+ android:textColor="@color/text_color_primary"
+ android:textSize="14sp" />
<EditText
android:id="@+id/alias"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/prompt_alias"
- android:singleLine="true"
- android:typeface="monospace"
- android:layout_below="@+id/textView4"
android:layout_alignParentLeft="true"
+ android:layout_below="@+id/textView4"
+ android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:layout_marginBottom="8dp">
- </EditText>
+ android:hint="@string/prompt_alias"
+ android:singleLine="true" />
<EditText
android:id="@+id/hostname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/prompt_hostname"
- android:singleLine="true"
- android:typeface="monospace"
- android:layout_below="@+id/alias"
android:layout_alignParentLeft="true"
+ android:layout_below="@+id/alias"
+ android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:layout_marginBottom="8dp">
- </EditText>
+ android:hint="@string/prompt_hostname"
+ android:singleLine="true"
+ android:typeface="monospace" />
<EditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/prompt_username"
- android:singleLine="true"
- android:typeface="monospace"
- android:layout_below="@+id/hostname"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_marginRight="16dp"
+ android:layout_below="@+id/hostname"
+ android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
- android:layout_marginBottom="8dp" />
+ android:layout_marginRight="16dp"
+ android:hint="@string/prompt_username"
+ android:singleLine="true"
+ android:typeface="monospace" />
- <cx.ring.views.PasswordEditText
+ <EditText
android:id="@+id/password"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/prompt_password"
- android:imeActionLabel="@string/action_create_short"
- android:imeOptions="actionGo"
- android:inputType="textPassword"
- android:singleLine="true"
- android:typeface="sans"
- android:layout_centerVertical="true"
- android:layout_alignEnd="@+id/username"
- android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_below="@+id/username"
+ android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:layout_marginBottom="8dp" />
+ android:hint="@string/prompt_password"
+ android:imeActionLabel="@string/action_create_short"
+ android:inputType="textPassword"
+ android:singleLine="true"
+ android:typeface="monospace" />
<Button
android:id="@+id/create_sip_button"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/create_sip_account"
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
- android:padding="8dp"
android:layout_alignParentLeft="true"
- android:layout_alignParentTop="false"
android:layout_alignParentStart="true"
+ android:layout_alignParentTop="false"
android:layout_below="@+id/password"
- android:layout_margin="8dp" />
+ android:layout_margin="8dp"
+ android:padding="8dp"
+ android:text="@string/create_sip_account" />
<ImageView
+ android:id="@+id/imageView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/imageView5"
- android:layout_alignParentTop="true"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
- android:src="@drawable/ic_dialer_sip_black_48dp"
- android:layout_margin="16dp" />
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_margin="16dp"
+ android:src="@drawable/ic_dialer_sip_black_48dp" />
</RelativeLayout>
</android.support.v7.widget.CardView>