yggdrasil-network/yggdrasil-android
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-android.git synced 2025-04-28 22:25:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI fixes, DNS infos. (#31)

Browse source
This commit is contained in:
Revertron 2022-11-16 22:08:28 +01:00 • committed by GitHub
parent c9476a7b00
commit ee81f4e902
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 103 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/activity_dns.xml
View file

@ -194,13 +194,8 @@
android:showDividers="middle">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:paddingStart="4pt"
android:paddingTop="2pt"
android:paddingEnd="4pt"
android:paddingBottom="4pt">
android:id="@+id/enableChromeFixPanel"
style="@style/SelectableSwitchItemStyle">
<TextView
android:layout_width="wrap_content"

88
app/src/main/res/layout/activity_main.xml
View file

@ -71,14 +71,8 @@
android:showDividers="middle">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
android:id="@+id/enableYggdrasilPanel"
style="@style/SelectableSwitchItemStyle">
<TextView
android:id="@+id/enableYggdrasilLabel"
@ -100,20 +94,14 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
<TableRow style="@style/SelectableItemStyle">
<TextView
android:id="@+id/yggdrasilStatusLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:text="@string/main_disabled"
android:textSize="14sp"
android:textStyle="bold" />
@ -160,15 +148,7 @@
android:paddingBottom="2pt"
android:showDividers="middle">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
<TableRow style="@style/SelectableItemStyle">
<TextView
android:id="@+id/ipAddressLabel"
@ -194,15 +174,7 @@
android:textSize="14sp" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
<TableRow style="@style/SelectableItemStyle">
<TextView
android:id="@+id/subnetLabel"
@ -229,15 +201,7 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
<TableRow style="@style/SelectableItemStyle">
<TextView
android:id="@+id/coordinatesLabel"
@ -305,14 +269,7 @@
<TableRow
android:id="@+id/peersTableRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:paddingStart="4pt"
android:paddingTop="6pt"
android:paddingEnd="4pt"
android:paddingBottom="6pt">
style="@style/SelectableItemStyle">
<TextView
android:id="@+id/multicastLabel"
@ -349,14 +306,7 @@
<TableRow
android:id="@+id/dnsTableRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:paddingStart="4pt"
android:paddingTop="6pt"
android:paddingEnd="4pt"
android:paddingBottom="6pt">
style="@style/SelectableItemStyle">
<TextView
android:id="@+id/dnsLabel"
@ -393,13 +343,7 @@
<TableRow
android:id="@+id/settingsTableRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:paddingStart="4pt"
android:paddingTop="6pt"
android:paddingEnd="4pt"
android:paddingBottom="6pt">
style="@style/SelectableItemStyle">
<TextView
android:id="@+id/settingsLabel"
@ -431,15 +375,7 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="4pt"
android:layout_marginLeft="4pt"
android:layout_marginTop="6pt"
android:layout_marginEnd="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="6pt">
<TableRow style="@style/SelectableItemStyle">
<TextView
android:id="@+id/versionLabel"

21
app/src/main/res/layout/activity_peers.xml
View file

@ -111,9 +111,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8pt"
android:layout_marginLeft="8pt"
android:layout_marginEnd="8pt"
android:layout_marginRight="8pt"
android:background="@drawable/rounded"
android:divider="#46878787"
android:dividerPadding="4pt"
@ -167,7 +165,6 @@
android:layout_marginEnd="8pt"
android:layout_marginRight="8pt"
android:background="@drawable/rounded"
android:clickable="true"
android:divider="#46878787"
android:dividerPadding="4pt"
android:paddingLeft="4pt"
@ -177,13 +174,8 @@
android:showDividers="middle">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:paddingStart="4pt"
android:paddingTop="2pt"
android:paddingEnd="4pt"
android:paddingBottom="4pt">
android:id="@+id/enableMulticastBeaconPanel"
style="@style/SelectableSwitchItemStyle">
<TextView
android:layout_width="wrap_content"
@ -204,13 +196,8 @@
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:paddingStart="4pt"
android:paddingTop="4pt"
android:paddingEnd="4pt"
android:paddingBottom="2pt">
android:id="@+id/enableMulticastListenPanel"
style="@style/SelectableSwitchItemStyle">
<TextView
android:layout_width="wrap_content"

14
app/src/main/res/layout/activity_settings.xml
View file

@ -162,13 +162,7 @@
android:paddingBottom="2pt"
android:showDividers="middle">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="4pt"
android:layout_marginTop="4pt"
android:layout_marginRight="4pt"
android:layout_marginBottom="4pt">
<TableRow style="@style/SelectableItemStyle">
<LinearLayout
android:layout_width="match_parent"
@ -242,11 +236,7 @@
<TableRow
android:id="@+id/resetConfigurationRow"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:padding="4pt">
style="@style/SelectableItemStyle">
<TextView
android:layout_width="wrap_content"

23
app/src/main/res/layout/dns_server_usable.xml
View file

@ -10,10 +10,11 @@
android:id="@+id/serverValue"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginStart="12dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="18dp"
android:layout_marginBottom="12dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="4dp"
android:gravity="center_vertical"
android:ellipsize="end"
android:singleLine="true"
android:text=""
@ -21,24 +22,16 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/addButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/space" />
<Space
android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/addButton"
app:layout_constraintEnd_toStartOf="@+id/addButton"
app:layout_constraintStart_toEndOf="@+id/serverValue"
app:layout_constraintTop_toTopOf="@+id/addButton" />
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/addButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="10dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="center_vertical"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

26
app/src/main/res/layout/peers_configured.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tableRow"
android:layout_width="match_parent"
@ -9,10 +10,11 @@
android:id="@+id/addressValue"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="18dp"
android:layout_marginStart="12dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="18dp"
android:layout_marginBottom="12dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="4dp"
android:gravity="center_vertical"
android:ellipsize="end"
android:singleLine="true"
android:text=""
@ -20,24 +22,16 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/space" />
<Space
android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/deletePeerButton"
app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
app:layout_constraintStart_toEndOf="@+id/addressValue"
app:layout_constraintTop_toTopOf="@+id/deletePeerButton" />
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/deletePeerButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="10dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_gravity="center_vertical"
android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/values-ru/strings.xml
View file

@ -65,4 +65,8 @@
<string name="public_key_hint">Ваш публичный ключ идентифицирует вас в сети. Его распространение безопасно.</string>
<string name="reset_configuration">Сбросить настройки</string>
<string name="reset_configuration_hint">Сброс создаст полностью новые настройки. Это изменит ваш публичный ключ и адрес IP.</string>
<string name="location_amsterdam">Амстердам, Нидерланды</string>
<string name="location_prague">Прага, Чехия</string>
<string name="location_bratislava">Братислава, Словакия</string>
<string name="location_buffalo">Баффало, США</string>
</resources>

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

@ -65,4 +65,8 @@
<string name="public_key_hint">Your public key forms your identity on the network. It is safe to be shared.</string>
<string name="reset_configuration">Reset configuration</string>
<string name="reset_configuration_hint">Resetting will overwrite with newly generated configuration. Your public keys and IP address on the network will change.</string>
<string name="location_amsterdam">Amsterdam, NL</string>
<string name="location_prague">Prague, CZ</string>
<string name="location_bratislava">Bratislava, SK</string>
<string name="location_buffalo">Buffalo, US</string>
</resources>

23
app/src/main/res/values/styles.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="SelectableItemStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:paddingTop">10dp</item>
<item name="android:paddingBottom">10dp</item>
</style>
<style name="SelectableSwitchItemStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
</style>
</resources>