From 9df5bdd62f2cc5b912db14b7569f5580368c3df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= <stefan.schueller@i-web.ch>
Date: Wed, 13 Mar 2019 13:34:17 +0100
Subject: [PATCH] Login Info

---
 .../peertube/activity/LoginActivity.java      | 11 +++++++++
 app/src/main/res/layout/activity_login.xml    | 23 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/net/schueller/peertube/activity/LoginActivity.java b/app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
index 991931b..df0a6df 100644
--- a/app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
@@ -23,6 +23,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.os.Bundle;
+import android.text.InputType;
 import android.util.Log;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -78,6 +79,16 @@ public class LoginActivity extends CommonActivity {
 
     }
 
+    @Override
+    public void onResume() {
+
+        EditText mServerName = findViewById(R.id.login_current_server);
+        mServerName.setText(APIUrlHelper.getUrl(this));
+        mServerName.setInputType(InputType.TYPE_NULL);
+
+        super.onResume();
+    }
+
     @Override
     public boolean onSupportNavigateUp() {
         finish(); // close this activity as oppose to navigating up
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index fd5bdc0..781f51b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,8 +7,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_login"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
@@ -46,8 +46,25 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textSize="16sp"
-                    android:text="Alpha! Login is still in heavy development and may not work correctly! You must have an account on the instance you are connecting to. Registration is currently not supported" />
+                    android:text="Alpha! Login is still in heavy development and may not work correctly! You must have an account on the instance you are connecting to. Registration is currently not supported"
+                    android:textSize="16sp" />
+
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <EditText
+                        android:id="@+id/login_current_server"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_current_server_hint"
+                        android:inputType="none"
+                        android:focusable="false"
+                        android:maxLines="1"
+                        android:singleLine="true" />
+                </com.google.android.material.textfield.TextInputLayout>
+
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d61f6fc..4c55fe6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -349,5 +349,6 @@
     <string name="video_rating_like" translatable="false">like</string>
     <string name="video_rating_dislike" translatable="false">dislike</string>
     <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
+    <string name="login_current_server_hint">Current Server</string>
 
 </resources>
\ No newline at end of file