Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: remove center alignment from TextViews for better readability #402

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

UI: remove center alignment from TextViews for better readability #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd6df64
ui(#387): refactor ui for better readability
hamidsafdari Oct 12, 2024
564b126
chore: add tools:text to all TextViews
hamidsafdari Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions primitiveFTPd/res/layout/block_client_action.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">

<!-- label -->
<TextView
android:id="@+id/clientActionsLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:text="@string/clientActionsLabel"
Expand All @@ -16,23 +15,23 @@
android:id="@+id/clientActionsLine1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textIsSelectable="true"
tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0"
/>
<TextView
android:id="@+id/clientActionsLine2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:visibility="gone"
android:textIsSelectable="true"
tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0/Download"
/>
<TextView
android:id="@+id/clientActionsLine3"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:visibility="gone"
android:textIsSelectable="true"
tools:text="2024-10-12 14:00:01 FS FTP 192.168.154.195 LIST_DIR /storage/emulated/0/Download/temp"
/>
</merge>
254 changes: 141 additions & 113 deletions primitiveFTPd/res/layout/block_connect_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,184 +1,212 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">

<!-- QuickShare Info -->
<TextView
android:id="@+id/quickShareInfo"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:focusable="false"
/>

<!-- interfaces/addresses and ports info in 2 columns -->
<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:layout_width="fill_parent"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="false">
>
<!-- QuickShare Info -->
<TextView
android:id="@+id/quickShareInfo"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:focusable="false"
android:gravity="center_horizontal"
android:visibility="gone"
tools:text="Running in QuickShare Mode for 1839 file(s)"
tools:visibility="visible"
/>

<!-- left column -->
<!-- interfaces/addresses and ports info in 2 columns -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">

<!-- addresses / interfaces -->
<TextView
android:id="@+id/addressesLabel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:focusable="false"
/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="16dp"
android:baselineAligned="false">

<!-- left column -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">

<!-- addresses / interfaces -->
<TextView
android:id="@+id/addressesLabel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:focusable="false"
tools:text="IP Address (Network Interface)"
/>

<LinearLayout
android:id="@+id/addressesContainer"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
tools:text="10.80.90.70 (rmnet_data3)"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
tools:text="192.168.43.1 (wlan0)"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
tools:text="aaaa:bbbb:cccc:dddd:eeee:ffff:0000:1111 (rmnet_data2)"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
tools:text="aaaa:bbbb:cccc:dddd:eeee:ffff:0000:1112 (rmnet_data1)"
/>
</LinearLayout>
</LinearLayout>

<!-- right column -->
<LinearLayout
android:id="@+id/addressesContainer"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
/>
android:layout_height="fill_parent"
android:orientation="vertical">

<!-- ports -->
<TextView
android:id="@+id/portsLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:focusable="false"
tools:text="Protocol / Port / State"
/>
<TextView
android:id="@+id/ftpTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:focusable="false"
tools:text="ftp / 2211 / Stopped"
/>
<TextView
android:id="@+id/sftpTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:focusable="false"
tools:text="sftp / 1234 / Stopped"
/>
</LinearLayout>
</LinearLayout>

<!-- right column -->
<!-- user name -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">

<!-- ports -->
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginTop="16dp"
>
<TextView
android:id="@+id/portsLabel"
android:layout_width="fill_parent"
android:id="@+id/usernameLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:focusable="false"
/>
<TextView
android:id="@+id/ftpTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textIsSelectable="true"
android:text="@string/prefTitleUser"
android:focusable="false"
/>
/>

<TextView
android:id="@+id/sftpTextView"
android:layout_width="fill_parent"
android:id="@+id/usernameTextView"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:textIsSelectable="true"
android:focusable="false"
/>
tools:text="ftp_username"
/>
</LinearLayout>
</LinearLayout>

<!-- user name -->
<TextView
android:id="@+id/usernameLabel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textStyle="bold"
android:layout_marginTop="16dp"
android:text="@string/prefTitleUser"
android:focusable="false"
/>
<TextView
android:id="@+id/usernameTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textIsSelectable="true"
android:focusable="false"
/>

<!-- login / auth / permission info in 2 columns -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="false"
android:layout_marginTop="16dp"
>

<!-- left column -->
<!-- login / auth / permission info in 2 columns -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:baselineAligned="false"
android:layout_marginTop="16dp"
>


<TextView
android:id="@+id/anonymousLoginTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
/>
tools:text="@string/isAnonymous"
/>

<TextView
android:id="@+id/passwordPresentTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/passwordPresent"
/>

<TextView
android:id="@+id/pubKeyAuthTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/pubKeyAuth"
/>
</LinearLayout>

<!-- right column -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="2"
android:orientation="vertical">

<TextView
android:id="@+id/hasNormalStorageAccessTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/hasNormalAccessToStorage"
/>

<TextView
android:id="@+id/hasFullStorageAccessTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/hasFullAccessToStorage"
/>

<TextView
android:id="@+id/hasMediaLocationAccessTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/hasAccessToMediaLocation"
/>

<TextView
android:id="@+id/hasNotificationPermissionTextView"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:focusable="false"
tools:text="@string/hasNotificationPermission"
/>
</LinearLayout>

Expand Down
Loading