Skip to content

Commit

Permalink
Layout changes on UI and github action flow (#4)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sami Väntti authored Feb 15, 2022
1 parent a1d6b4e commit 5b6e3b1
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 8 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ jobs:
./gradlew clean assembleDebug
- run: tree
- name: Archive apk
if: startsWith(github.ref, 'refs/tags/v')
uses: actions/upload-artifact@v2
with:
name: app-debug-apk
path: 'app/build/outputs/apk/debug/app-debug.apk'
- name: Add apk to release
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@v1
with:
files: 'app/build/outputs/apk/debug/app-debug.apk'
1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions app/src/main/res/drawable/constraint_layout_style.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="3dip" android:color="#5D3FD3" />
<corners android:radius="8dip"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>
22 changes: 15 additions & 7 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,21 @@
android:layout_marginStart="16dp"
android:layout_marginTop="84dp"
android:layout_marginBottom="16dp"
android:background="@drawable/constraint_layout_style"
android:ems="10"
android:gravity="start|top"
android:inputType="textMultiLine"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/unpairedDevicesLayout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bl_devices_text"
tools:text="@tools:sample/lorem">
app:layout_constraintTop_toBottomOf="@+id/bl_devices_text">

<TextView
android:id="@+id/connectedDevicesTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Paired Devices"
app:layout_constraintStart_toStartOf="parent" />

Expand All @@ -60,38 +63,43 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/connectedDevicesTitle"
android:layout_marginTop="0dp" />
android:layout_marginTop="0dp"
android:gravity="center"
tools:ignore="DuplicateSpeakableTextCheck" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/unpairedDevicesLayout"
android:layout_width="178dp"
android:layout_height="365dp"
android:layout_marginStart="16dp"
android:layout_marginStart="8dp"
android:layout_marginTop="84dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/constraint_layout_style"
android:ems="10"
android:gravity="start|top"
android:inputType="textMultiLine"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/pairedDevicesLayout"
app:layout_constraintTop_toBottomOf="@+id/bl_devices_text">
app:layout_constraintTop_toBottomOf="@+id/bl_devices_text">>

<TextView
android:id="@+id/disconnectedDevicesTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Unpaired Devices"
app:layout_constraintStart_toStartOf="parent" />

<ListView
android:id="@+id/unpairedDevices"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/disconnectedDevicesTitle" />
android:layout_below="@+id/disconnectedDevicesTitle"
android:gravity="center" />
</RelativeLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 5b6e3b1

Please sign in to comment.