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

Build 6

Browse source 
Fixes #8
Fixes #6
This commit is contained in:
Neil Alexander 2021-08-21 22:18:40 +01:00
parent 27e1909aa2
commit 5887ae47b2
6 changed files with 810 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -11,7 +11,7 @@ android {
applicationId "eu.neilalexander.yggdrasil" applicationId "eu.neilalexander.yggdrasil"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 5 versionCode 6
versionName "0.1" versionName "0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@ -27,6 +27,15 @@
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold" /> android:textStyle="bold" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/statusSectionLabel" android:id="@+id/statusSectionLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -426,6 +435,10 @@
android:textAllCaps="false" android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@ -47,6 +47,15 @@
app:srcCompat="@drawable/ic_baseline_add_circle_24" /> app:srcCompat="@drawable/ic_baseline_add_circle_24" />
</LinearLayout> </LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView <TextView
android:id="@+id/connectedPeersLabel" android:id="@+id/connectedPeersLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -237,6 +246,8 @@
android:textAllCaps="false" android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>

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

@ -38,6 +38,15 @@
</LinearLayout> </LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -262,6 +271,9 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="12sp" /> android:textSize="12sp" />
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@ -1,29 +1,47 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableRow 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/tableRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:padding="4pt">
<TextView <TextView
android:id="@+id/addressValue" android:id="@+id/addressValue"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginStart="18dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="18dp"
android:layout_marginBottom="12dp"
android:ellipsize="end"
android:singleLine="true"
android:text="TextView" android:text="TextView"
android:textColor="?attr/textDefault" /> android:textColor="?attr/textDefault"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/space" />
<Space <Space
android:layout_width="wrap_content" android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> app:layout_constraintBottom_toTopOf="@+id/deletePeerButton"
app:layout_constraintEnd_toStartOf="@+id/deletePeerButton"
app:layout_constraintStart_toEndOf="@+id/addressValue"
app:layout_constraintTop_toTopOf="@+id/deletePeerButton" />
<ImageButton <ImageButton
android:id="@+id/deletePeerButton" android:id="@+id/deletePeerButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginTop="8dp"
android:layout_marginRight="2pt" android:layout_marginEnd="4dp"
android:layout_marginBottom="10dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_baseline_remove_circle_24" /> app:srcCompat="@drawable/ic_baseline_remove_circle_24" />
</TableRow> </androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/peers_connected.xml
View file

@ -16,6 +16,8 @@
android:id="@+id/addressLabel" android:id="@+id/addressLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="(unknown)" android:text="(unknown)"
android:textColor="?attr/textDefault" /> android:textColor="?attr/textDefault" />
@ -24,6 +26,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.5" android:alpha="0.5"
android:ellipsize="end"
android:singleLine="true"
android:text="TCP peer on unknown" android:text="TCP peer on unknown"
android:textColor="?attr/textDefault" android:textColor="?attr/textDefault"
android:textSize="12sp" /> android:textSize="12sp" />