greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Login Info

Browse Source
This commit is contained in:
Stefan Schüller 2019-03-13 13:34:17 +01:00
parent 5dbd2b4e29
commit 9df5bdd62f
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
View File

@ -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

23
app/src/main/res/layout/activity_login.xml
View File

@ -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"

1
app/src/main/res/values/strings.xml
View File

@ -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>