Skip to content
Snippets Groups Projects
Commit f3c6af49 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

ui: cleanup account creation 

Tuleap: #124
Change-Id: I55c727b5c35d344b13657c5051656c2f233eb68e
parent bd99d6af
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 232 deletions
ring-android/app/src/main/java/cx/ring/fragments/AccountCreationFragment.java
+ 4
− 5
View file @ f3c6af49
/* /*
* Copyright (C) 2004-2015 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
* *
* Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com> * Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
* *
...@@ -45,7 +45,6 @@ import android.widget.TextView.OnEditorActionListener; ...@@ -45,7 +45,6 @@ import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast; import android.widget.Toast;
import cx.ring.service.LocalService; import cx.ring.service.LocalService;
import cx.ring.views.PasswordEditText;
public class AccountCreationFragment extends Fragment { public class AccountCreationFragment extends Fragment {
static final String TAG = AccountCreationFragment.class.getSimpleName(); static final String TAG = AccountCreationFragment.class.getSimpleName();
...@@ -61,7 +60,7 @@ public class AccountCreationFragment extends Fragment { ...@@ -61,7 +60,7 @@ public class AccountCreationFragment extends Fragment {
private EditText mAliasView; private EditText mAliasView;
private EditText mHostnameView; private EditText mHostnameView;
private EditText mUsernameView; private EditText mUsernameView;
private PasswordEditText mPasswordView; private EditText mPasswordView;
private LocalService.Callbacks mCallbacks = LocalService.DUMMY_CALLBACKS; private LocalService.Callbacks mCallbacks = LocalService.DUMMY_CALLBACKS;
...@@ -77,9 +76,9 @@ public class AccountCreationFragment extends Fragment { ...@@ -77,9 +76,9 @@ public class AccountCreationFragment extends Fragment {
mAliasView = (EditText) inflatedView.findViewById(R.id.alias); mAliasView = (EditText) inflatedView.findViewById(R.id.alias);
mHostnameView = (EditText) inflatedView.findViewById(R.id.hostname); mHostnameView = (EditText) inflatedView.findViewById(R.id.hostname);
mUsernameView = (EditText) inflatedView.findViewById(R.id.username); 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 @Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
mAccountType = "SIP"; mAccountType = "SIP";
......
ring-android/app/src/main/java/cx/ring/fragments/AdvancedAccountFragment.java
+ 1
− 1
View file @ f3c6af49
...@@ -175,7 +175,7 @@ public class AdvancedAccountFragment extends PreferenceFragment { ...@@ -175,7 +175,7 @@ public class AdvancedAccountFragment extends PreferenceFragment {
preference.getKey().contentEquals(AccountDetailAdvanced.CONFIG_AUDIO_PORT_MIN)) preference.getKey().contentEquals(AccountDetailAdvanced.CONFIG_AUDIO_PORT_MIN))
newValue = adjustRtpRange(Integer.valueOf((String) newValue)); newValue = adjustRtpRange(Integer.valueOf((String) newValue));
preference.setSummary((CharSequence) newValue); preference.setSummary(newValue.toString());
mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), newValue.toString()); mCallbacks.getAccount().getAdvancedDetails().setDetailString(preference.getKey(), newValue.toString());
} }
......
ring-android/app/src/main/java/cx/ring/views/CredentialsPreference.java
+ 3
− 3
View file @ f3c6af49
...@@ -57,7 +57,7 @@ import cx.ring.model.account.CredentialsManager; ...@@ -57,7 +57,7 @@ import cx.ring.model.account.CredentialsManager;
public class CredentialsPreference extends DialogPreference { public class CredentialsPreference extends DialogPreference {
EditText mUsernameField; EditText mUsernameField;
PasswordEditText mPasswordField; EditText mPasswordField;
EditText mRealmField; EditText mRealmField;
public CredentialsPreference(Context context, AttributeSet attrs) { public CredentialsPreference(Context context, AttributeSet attrs) {
...@@ -72,13 +72,13 @@ public class CredentialsPreference extends DialogPreference { ...@@ -72,13 +72,13 @@ public class CredentialsPreference extends DialogPreference {
View view = inflater.inflate(R.layout.credentials_pref, null); View view = inflater.inflate(R.layout.credentials_pref, null);
mUsernameField = (EditText) view.findViewById(R.id.credentials_username); 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); mRealmField = (EditText) view.findViewById(R.id.credentials_realm);
if (getExtras().getSerializable(CredentialsManager.CURRENT_CRED) != null) { if (getExtras().getSerializable(CredentialsManager.CURRENT_CRED) != null) {
HashMap<String, String> details = (HashMap<String, String>) getExtras().getSerializable(CredentialsManager.CURRENT_CRED); HashMap<String, String> details = (HashMap<String, String>) getExtras().getSerializable(CredentialsManager.CURRENT_CRED);
mUsernameField.setText(details.get(AccountCredentials.CONFIG_ACCOUNT_USERNAME)); 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)); mRealmField.setText(details.get(AccountCredentials.CONFIG_ACCOUNT_REALM));
} }
......
ring-android/app/src/main/java/cx/ring/views/PasswordEditText.java deleted 100644 → 0
+ 0
− 115
View file @ bd99d6af
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
ring-android/app/src/main/res/layout/credentials_pref.xml
+ 8
− 7
View file @ f3c6af49
...@@ -39,25 +39,26 @@ as that of the covered work. ...@@ -39,25 +39,26 @@ as that of the covered work.
android:id="@+id/credentials_username" android:id="@+id/credentials_username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/account_username_label"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions" >
android:hint="Username..." >
<requestFocus /> <requestFocus />
</EditText> </EditText>
<cx.ring.views.PasswordEditText <EditText
android:id="@+id/credentials_password" android:id="@+id/credentials_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="actionNext" /> android:hint="@string/account_password_label"
android:imeOptions="actionNext"
android:inputType="textPassword" />
<EditText <EditText
android:id="@+id/credentials_realm" android:id="@+id/credentials_realm"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textNoSuggestions" android:hint="Realm..."
android:imeOptions="actionGo" android:imeOptions="actionGo"
android:hint="Realm..." /> android:inputType="textNoSuggestions" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
ring-android/app/src/main/res/layout/frag_account_creation.xml
+ 94
− 101
View file @ f3c6af49
...@@ -22,211 +22,204 @@ along with this program; if not, write to the Free Software ...@@ -22,211 +22,204 @@ along with this program; if not, write to the Free Software
android:id="@+id/login_form" android:id="@+id/login_form"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".client.AccountWizard" android:background="#eeeeee"
android:background="#eeeeee"> tools:context=".client.AccountWizard">
<LinearLayout <LinearLayout
style="@style/AccountFormContainer" style="@style/AccountFormContainer"
android:orientation="vertical"
android:descendantFocusability="beforeDescendants" android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" > android:focusableInTouchMode="true"
android:orientation="vertical">
<android.support.v7.widget.CardView <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/ring_card_view" android:id="@+id/ring_card_view"
android:layout_gravity="center"
android:layout_width="280dp" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
card_view:cardCornerRadius="2dp" android:layout_gravity="center"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp"
card_view:cardCornerRadius="2dp">
<RelativeLayout <RelativeLayout
android:orientation="vertical" android:id="@+id/ring_fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/ring_fields"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/imageView6"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:src="@drawable/ring_logo_48dp" android:layout_alignParentRight="true"
android:layout_margin="16dp" /> android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:src="@drawable/ring_logo_48dp" />
<TextView <TextView
android:id="@+id/ring_acc_title_txt"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" 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_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:id="@+id/ring_acc_title_txt"
android:layout_toLeftOf="@+id/imageView6" 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 <TextView
android:id="@+id/textView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/help_ring" android:layout_alignParentStart="true"
android:id="@+id/textView" android:layout_below="@+id/ring_acc_title_txt"
android:padding="16dp"
android:singleLine="false" android:singleLine="false"
android:text="@string/help_ring"
android:textColor="@color/text_color_primary" android:textColor="@color/text_color_primary"
android:padding="16dp" android:textSize="14sp" />
android:textSize="14sp"
android:layout_alignParentStart="true"
android:layout_below="@+id/ring_acc_title_txt" />
<Button <Button
android:id="@+id/create_ring_account" android:id="@+id/create_ring_account"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/create_ring_account" android:layout_alignParentEnd="false"
style="@style/Widget.AppCompat.Button.Borderless.Colored" android:layout_alignParentStart="false"
android:layout_below="@+id/textView"
android:layout_margin="8dp" android:layout_margin="8dp"
android:padding="8dp" android:padding="8dp"
android:layout_below="@+id/textView" android:text="@string/create_ring_account" />
android:layout_alignParentStart="false"
android:layout_alignParentEnd="false" />
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<android.support.v7.widget.CardView <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/card_view" android:id="@+id/card_view"
android:layout_gravity="center"
android:layout_width="280dp" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
card_view:cardCornerRadius="2dp" android:layout_gravity="center"
android:layout_margin="8dp"> android:layout_margin="8dp"
card_view:cardCornerRadius="2dp">
<RelativeLayout <RelativeLayout
android:orientation="vertical" android:id="@+id/sip_fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/sip_fields" android:nestedScrollingEnabled="false"
android:nestedScrollingEnabled="false"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/textView3"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" 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_alignParentLeft="true"
android:layout_alignParentTop="true"
android:id="@+id/textView3"
android:layout_alignParentStart="false" android:layout_alignParentStart="false"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/imageView5" 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 <TextView
android:id="@+id/textView4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/help_sip" android:layout_alignParentEnd="true"
android:singleLine="false" android:layout_alignParentStart="true"
android:textColor="@color/text_color_primary"
android:textSize="14sp"
android:layout_below="@+id/textView3" android:layout_below="@+id/textView3"
android:id="@+id/textView4"
android:padding="16dp" android:padding="16dp"
android:layout_alignParentEnd="true" android:singleLine="false"
android:layout_alignParentStart="true" /> android:text="@string/help_sip"
android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<EditText <EditText
android:id="@+id/alias" android:id="@+id/alias"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_alignParentLeft="true"
android:layout_below="@+id/textView4"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"> android:hint="@string/prompt_alias"
</EditText> android:singleLine="true" />
<EditText <EditText
android:id="@+id/hostname" android:id="@+id/hostname"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_alignParentLeft="true"
android:layout_below="@+id/alias"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"> android:hint="@string/prompt_hostname"
</EditText> android:singleLine="true"
android:typeface="monospace" />
<EditText <EditText
android:id="@+id/username" android:id="@+id/username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginRight="16dp" android:layout_below="@+id/hostname"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" 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:id="@+id/password"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/username" android:layout_below="@+id/username"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="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 <Button
android:id="@+id/create_sip_button" android:id="@+id/create_sip_button"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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_alignParentLeft="true"
android:layout_alignParentTop="false"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="false"
android:layout_below="@+id/password" android:layout_below="@+id/password"
android:layout_margin="8dp" /> android:layout_margin="8dp"
android:padding="8dp"
android:text="@string/create_sip_account" />
<ImageView <ImageView
android:id="@+id/imageView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/imageView5"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:src="@drawable/ic_dialer_sip_black_48dp" android:layout_alignParentRight="true"
android:layout_margin="16dp" /> android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:src="@drawable/ic_dialer_sip_black_48dp" />
</RelativeLayout> </RelativeLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment