kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show full url in connection string

Browse Source
This commit is contained in:
Jannis Mattheis
2019-03-08 10:13:46 +01:00
parent b19132e081
commit 3b2fc90569
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/res/layout/nav_header_drawer.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:layout_alignParentBottom="false"
@@ -21,25 +22,36 @@
android:focusableInTouchMode="true"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:scaleType="fitCenter"
app:layout_constraintBottom_toTopOf="@+id/header_versions"
app:layout_constraintBottom_toTopOf="@+id/header_user"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/gotify" />
<TextView
android:id="@+id/header_versions"
android:id="@+id/header_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Gotify v1.0.0"
android:text="jmattheis"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintBottom_toTopOf="@+id/header_username"
app:layout_constraintBottom_toTopOf="@+id/header_connection"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/header_username"
android:id="@+id/header_connection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="admin@your.domain.de"
android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@+id/header_version"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/header_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="admin@your.domain.de"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />

2
app/src/main/res/values/dimens.xml
View File

@@ -3,5 +3,5 @@
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen>
<dimen name="nav_header_height">196dp</dimen>
</resources>

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

@@ -48,8 +48,7 @@
<string name="websocket_listening">Listening to %s</string>
<string name="websocket_could_not_connect">Could not connect %s</string>
<string name="websocket_init">Initializing</string>
<string name="connection">%s@%s</string>
<string name="server_version">Gotify-Server v%s</string>
<string name="versions">gotify/android v%s; gotify/server v%s</string>
<string name="advanced_settings">Advanced Settings</string>
<string name="done">Done</string>
<string name="no_certificate_selected">No certificate selected</string>
@@ -58,4 +57,5 @@
<string name="http_warning">Using http is insecure and it\'s recommend to use https instead. Use your favorite search engine to get more information about this topic.</string>
<string name="i_understand">I Understand</string>
<string name="websocket_no_network">Waiting for network</string>
<string name="connection">%s@%s</string>
</resources>