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

Use an dialog to show advanced settings

Browse Source
This commit is contained in:
Jannis Mattheis
2018-11-10 14:42:05 +01:00
committed by Galen Abell
parent 78a7f1319e
commit bcfa8ac221
5 changed files with 185 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/drawable/ic_settings.xml Normal file
View File

@@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="20"
android:viewportWidth="20" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M15.95,10.78c0.03,-0.25 0.05,-0.51 0.05,-0.78s-0.02,-0.53 -0.06,-0.78l1.69,-1.32c0.15,-0.12 0.19,-0.34 0.1,-0.51l-1.6,-2.77c-0.1,-0.18 -0.31,-0.24 -0.49,-0.18l-1.99,0.8c-0.42,-0.32 -0.86,-0.58 -1.35,-0.78L12,2.34c-0.03,-0.2 -0.2,-0.34 -0.4,-0.34H8.4c-0.2,0 -0.36,0.14 -0.39,0.34l-0.3,2.12c-0.49,0.2 -0.94,0.47 -1.35,0.78l-1.99,-0.8c-0.18,-0.07 -0.39,0 -0.49,0.18l-1.6,2.77c-0.1,0.18 -0.06,0.39 0.1,0.51l1.69,1.32c-0.04,0.25 -0.07,0.52 -0.07,0.78s0.02,0.53 0.06,0.78L2.37,12.1c-0.15,0.12 -0.19,0.34 -0.1,0.51l1.6,2.77c0.1,0.18 0.31,0.24 0.49,0.18l1.99,-0.8c0.42,0.32 0.86,0.58 1.35,0.78l0.3,2.12c0.04,0.2 0.2,0.34 0.4,0.34h3.2c0.2,0 0.37,-0.14 0.39,-0.34l0.3,-2.12c0.49,-0.2 0.94,-0.47 1.35,-0.78l1.99,0.8c0.18,0.07 0.39,0 0.49,-0.18l1.6,-2.77c0.1,-0.18 0.06,-0.39 -0.1,-0.51l-1.67,-1.32zM10,13c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3 3,1.35 3,3 -1.35,3 -3,3z"/>
</vector>

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

@@ -202,17 +202,26 @@
android:id="@+id/checkurl"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintWidth_max="280dp"
android:background="@color/colorPrimaryDark"
android:text="@string/check_url"
android:textColor="@android:color/white"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gotify_url" />
app:layout_constraintEnd_toStartOf="@+id/advanced_settings"
app:layout_constraintStart_toStartOf="@+id/gotify_url"
app:layout_constraintTop_toBottomOf="@+id/gotify_url"
app:layout_constraintWidth_max="280dp" />
<ImageButton
android:id="@+id/advanced_settings"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="@string/check_url"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/gotify_url"
app:layout_constraintTop_toTopOf="@+id/checkurl"
app:srcCompat="@drawable/ic_settings" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

24
app/src/main/res/layout/advanced_settings_dialog.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp">
<CheckBox
android:id="@+id/disableSSL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Disable SSL Validation" />
<Button
android:id="@+id/toggle_ca_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Select CA Certificate" />
<TextView
android:id="@+id/seleceted_ca_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="No Certificate selected" />
</LinearLayout>