Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 61aa4c1

Browse files
committed
Added server Url, realmName editText to the login Activity
1 parent b8fb68b commit 61aa4c1

File tree

5 files changed

+19
-0
lines changed

5 files changed

+19
-0
lines changed

app/src/main/java/com/zulip/android/activities/LoginActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
4848
private EditText mUserName;
4949
private EditText mPassword;
5050
private EditText serverIn;
51+
private EditText realmNameET;
5152

5253
private View mGoogleSignInButton;
5354

@@ -96,6 +97,7 @@ public void onClick(View view) {
9697
private void showLoginFields() {
9798
AnimationHelper.showView(findViewById(R.id.serverInput), 201);
9899
AnimationHelper.hideView(findViewById(R.id.serverFieldLayout), 100);
100+
realmNameET = (EditText) findViewById(R.id.realmName);
99101
}
100102

101103
@Override

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.annotation.SuppressLint;
1212
import android.annotation.TargetApi;
1313
import android.app.AlertDialog;
14+
import android.app.ProgressDialog;
1415
import android.app.SearchManager;
1516
import android.content.BroadcastReceiver;
1617
import android.content.ComponentName;

app/src/main/res/layout-v21/login.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
android:text="@string/enter_server"
4747
android:textAppearance="?android:attr/textAppearanceMedium" />
4848

49+
<EditText
50+
android:id="@+id/realmName"
51+
android:layout_width="match_parent"
52+
android:layout_height="wrap_content"
53+
android:hint="@string/realm_name" />
54+
4955
<EditText
5056
android:id="@+id/server_url_in"
5157
android:layout_width="match_parent"

app/src/main/res/layout/login.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
android:text="@string/enter_server"
4141
android:textAppearance="?android:attr/textAppearanceMedium" />
4242

43+
<EditText
44+
android:id="@+id/realmName"
45+
android:layout_width="match_parent"
46+
android:layout_height="wrap_content"
47+
android:hint="@string/realm_name" />
48+
4349
<EditText
4450
android:id="@+id/server_url_in"
4551
android:layout_width="match_parent"

app/src/main/res/values/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,8 @@
8080
<string name="realm_switching">Switching realm</string>
8181
<string name="please_wait">Please wait</string>
8282
<string name="realm_add">Add Realm</string>
83+
<string name="realm_name">Name of a realm (Optional)</string>
84+
85+
86+
8387
</resources>

0 commit comments

Comments
 (0)