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

Commit 2b776a4

Browse files
committed
Added server Url, realmName editText to the login Activity
1 parent 1c218a0 commit 2b776a4

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
@@ -47,6 +47,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
4747
private EditText mUserName;
4848
private EditText mPassword;
4949
private EditText serverIn;
50+
private EditText realmNameET;
5051

5152
private View mGoogleSignInButton;
5253
@Override
@@ -132,6 +133,7 @@ public void onClick(View view) {
132133
private void showLoginFields() {
133134
AnimationHelper.showView(findViewById(R.id.serverInput), 201);
134135
AnimationHelper.hideView(findViewById(R.id.serverFieldLayout), 100);
136+
realmNameET = (EditText) findViewById(R.id.realmName);
135137
}
136138

137139
@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
@@ -10,6 +10,7 @@
1010
import android.annotation.SuppressLint;
1111
import android.annotation.TargetApi;
1212
import android.app.AlertDialog;
13+
import android.app.ProgressDialog;
1314
import android.app.SearchManager;
1415
import android.content.BroadcastReceiver;
1516
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
@@ -47,6 +47,12 @@
4747
android:text="@string/enter_server"
4848
android:textAppearance="?android:attr/textAppearanceMedium" />
4949

50+
<EditText
51+
android:id="@+id/realmName"
52+
android:layout_width="match_parent"
53+
android:layout_height="wrap_content"
54+
android:hint="@string/realm_name" />
55+
5056
<EditText
5157
android:id="@+id/server_url_in"
5258
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
@@ -42,6 +42,12 @@
4242
android:text="@string/enter_server"
4343
android:textAppearance="?android:attr/textAppearanceMedium" />
4444

45+
<EditText
46+
android:id="@+id/realmName"
47+
android:layout_width="match_parent"
48+
android:layout_height="wrap_content"
49+
android:hint="@string/realm_name" />
50+
4551
<EditText
4652
android:id="@+id/server_url_in"
4753
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
@@ -79,4 +79,8 @@
7979
<string name="realm_switching">Switching Realm</string>
8080
<string name="please_wait">Please wait</string>
8181
<string name="realm_add">Add Realm</string>
82+
<string name="realm_name">Name of a realm (Optional)</string>
83+
84+
85+
8286
</resources>

0 commit comments

Comments
 (0)