Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing login view for tablet 533dp

Browse source
This commit is contained in:
Erwan Croze 2017-10-12 12:01:34 +02:00
parent d8f336b884
commit 65740199bf
4 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
res/layout-sw533dp-land/assistant_login.xml
View file

@ -146,6 +146,29 @@
android:gravity="center" android:gravity="center"
android:layout_margin="10dp"> android:layout_margin="10dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<TextView
android:text="@string/userid"
style="@style/font13"
android:textAllCaps="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<EditText
android:id="@+id/assistant_userid"
android:background="@drawable/resizable_textfield"
android:textColor="@color/colorB"
android:inputType="text|textNoSuggestions"
android:contentDescription="@string/content_description_username_field"
android:layout_width="match_parent"
android:layout_height="40dp"
android:maxLines="1"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/assistant_login.xml
View file

@ -105,7 +105,6 @@
android:maxLines="1"/> android:maxLines="1"/>
<TextView <TextView
android:visibility="gone"
android:text="@string/assistant_display_name_optional" android:text="@string/assistant_display_name_optional"
style="@style/font13" style="@style/font13"
android:textAllCaps="true" android:textAllCaps="true"
@ -114,7 +113,6 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<EditText <EditText
android:visibility="gone"
android:id="@+id/assistant_display_name" android:id="@+id/assistant_display_name"
android:background="@drawable/resizable_textfield" android:background="@drawable/resizable_textfield"
android:textColor="@color/colorB" android:textColor="@color/colorB"

7
src/android/org/linphone/assistant/AssistantActivity.java
View file

@ -410,8 +410,8 @@ private static AssistantActivity instance;
configureLinphoneProxyConfig(accountCreator); configureLinphoneProxyConfig(accountCreator);
} }
public void genericLogIn(String username, String userid, String password, String prefix, String domain, TransportType transport) { public void genericLogIn(String username, String userid, String password, String displayname, String prefix, String domain, TransportType transport) {
saveCreatedAccount(username, userid, password, null, prefix, domain, transport); saveCreatedAccount(username, userid, password, displayname, null, prefix, domain, transport);
} }
private void display(AssistantFragmentsEnum fragment) { private void display(AssistantFragmentsEnum fragment) {
@ -507,7 +507,7 @@ private static AssistantActivity instance;
return phoneNumberWithCountry; return phoneNumberWithCountry;
} }
public void saveCreatedAccount(String username, String userid, String password, String ha1, String prefix, String domain, TransportType transport) { public void saveCreatedAccount(String username, String userid, String password, String displayname, String ha1, String prefix, String domain, TransportType transport) {
username = LinphoneUtils.getDisplayableUsernameFromAddress(username); username = LinphoneUtils.getDisplayableUsernameFromAddress(username);
domain = LinphoneUtils.getDisplayableUsernameFromAddress(domain); domain = LinphoneUtils.getDisplayableUsernameFromAddress(domain);
@ -524,6 +524,7 @@ private static AssistantActivity instance;
.setDomain(domain) .setDomain(domain)
.setHa1(ha1) .setHa1(ha1)
.setUserId(userid) .setUserId(userid)
.setDisplayName(displayname)
.setPassword(password); .setPassword(password);
if (prefix != null) { if (prefix != null) {

6
src/android/org/linphone/assistant/LoginFragment.java
View file

@ -34,7 +34,7 @@ import android.widget.RadioGroup;
import android.widget.Toast; import android.widget.Toast;
public class LoginFragment extends Fragment implements OnClickListener, TextWatcher { public class LoginFragment extends Fragment implements OnClickListener, TextWatcher {
private EditText login, userid, password, domain; private EditText login, userid, password, domain, displayName;
private RadioGroup transports; private RadioGroup transports;
private Button apply; private Button apply;
@ -45,6 +45,8 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc
login = (EditText) view.findViewById(R.id.assistant_username); login = (EditText) view.findViewById(R.id.assistant_username);
login.addTextChangedListener(this); login.addTextChangedListener(this);
displayName = (EditText) view.findViewById(R.id.assistant_display_name);
displayName.addTextChangedListener(this);
userid = (EditText) view.findViewById(R.id.assistant_userid); userid = (EditText) view.findViewById(R.id.assistant_userid);
userid.addTextChangedListener(this); userid.addTextChangedListener(this);
password = (EditText) view.findViewById(R.id.assistant_password); password = (EditText) view.findViewById(R.id.assistant_password);
@ -83,7 +85,7 @@ public class LoginFragment extends Fragment implements OnClickListener, TextWatc
if (domain.getText().toString().compareTo(getString(R.string.default_domain)) == 0) { if (domain.getText().toString().compareTo(getString(R.string.default_domain)) == 0) {
AssistantActivity.instance().displayLoginLinphone(login.getText().toString(), password.getText().toString()); AssistantActivity.instance().displayLoginLinphone(login.getText().toString(), password.getText().toString());
} else { } else {
AssistantActivity.instance().genericLogIn(login.getText().toString(), userid.getText().toString(), password.getText().toString(), null, domain.getText().toString(), transport); AssistantActivity.instance().genericLogIn(login.getText().toString(), userid.getText().toString(), password.getText().toString(), displayName.getText().toString(), null, domain.getText().toString(), transport);
} }
} }
} }