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

Enhanced UI - AmazeFileManager #4206

Closed
wants to merge 1 commit into from
Closed

Enhanced UI - AmazeFileManager #4206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions app/src/main/res/layout/activity_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="12dp"
android:layout_margin="@dimen/material_generic"
app:cardElevation="@dimen/material_generic_card_elevation"
>
Expand Down Expand Up @@ -199,6 +200,7 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="12dp"
android:layout_margin="@dimen/material_generic"
app:cardElevation="@dimen/material_generic_card_elevation"
>
Expand Down Expand Up @@ -497,6 +499,7 @@
<!-- Support Development -->
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
app:cardCornerRadius="12dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/material_generic"
app:cardElevation="@dimen/material_generic_card_elevation"
Expand Down Expand Up @@ -817,6 +820,7 @@
<!-- Translators -->
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
app:cardCornerRadius="12dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/material_generic"
app:cardElevation="@dimen/material_generic_card_elevation"
Expand Down Expand Up @@ -1307,6 +1311,7 @@
<!-- Contributors -->
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
app:cardCornerRadius="12dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/material_generic"
app:cardElevation="@dimen/material_generic_card_elevation"
Expand Down
130 changes: 61 additions & 69 deletions app/src/main/res/layout/fragment_ftp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ftpserver_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/material_generic"
android:orientation="vertical"
android:descendantFocusability="afterDescendants"
>
android:orientation="vertical"
android:padding="@dimen/material_generic">

<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:padding="@dimen/material_generic"
app:cardUseCompatPadding="true"
android:descendantFocusability="afterDescendants"
android:focusable="true"
android:padding="@dimen/material_generic"
app:cardCornerRadius="12dp"
app:cardElevation="@dimen/material_generic_card_elevation"
android:descendantFocusability="afterDescendants">
app:cardUseCompatPadding="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:descendantFocusability="afterDescendants">
android:descendantFocusability="afterDescendants"
android:orientation="vertical">

<!-- status -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="@dimen/material_generic_title"
android:padding="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- port -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_url"
android:id="@+id/text_view_ftp_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
android:paddingBottom="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_status"/>

<!-- shared path -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
android:paddingBottom="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:drawableRightCompat="@drawable/ic_clear_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
android:paddingBottom="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_status"/>
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port" />

<View
android:id="@+id/divider_ftp_status"
Expand All @@ -67,8 +95,8 @@
android:id="@+id/text_view_ftp_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/material_generic_title"
android:padding="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider_ftp_status" />
Expand All @@ -80,77 +108,41 @@
android:id="@+id/text_view_ftp_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/material_generic_title"
android:paddingBottom="@dimen/padding_normal"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
android:paddingBottom="@dimen/padding_normal"
android:textSize="@dimen/material_generic_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username"/>
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username" />

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/ftp_password_visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
app:srcCompat="@drawable/ic_eye_grey600_24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintRight_toLeftOf="@id/text_view_ftp_password"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_username"
app:layout_constraintRight_toLeftOf="@id/text_view_ftp_password" />
app:srcCompat="@drawable/ic_eye_grey600_24dp" />


<!-- port -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/material_generic_title"
android:paddingBottom="@dimen/padding_normal"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_password"/>

<!-- shared path -->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_ftp_path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/material_generic_title"
android:paddingBottom="@dimen/padding_normal"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
app:drawableRightCompat="@drawable/ic_clear_all"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_port"/>

<View
android:id="@+id/divider_ftp_start"
android:layout_width="wrap_content"
android:layout_height="1dp"
android:paddingLeft="@dimen/padding_normal"
android:paddingRight="@dimen/padding_normal"
android:background="@color/divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_ftp_path" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/startStopButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:text="@string/start_ftp"
android:padding="@dimen/padding_normal"
android:focusable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider_ftp_start"/>

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

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/startStopButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:elevation="@dimen/material_generic_card_elevation"
android:padding="@dimen/padding_normal"
android:text="@string/start_ftp"
tools:targetApi="lollipop" />
</LinearLayout>
21 changes: 12 additions & 9 deletions app/src/main/res/layout/layout_appbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.appbar.AppBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/lin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -9,7 +10,6 @@

<androidx.appcompat.widget.Toolbar
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_bar"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
Expand All @@ -34,10 +34,10 @@
>

<HorizontalScrollView
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:scrollbars="none"
android:id="@+id/scroll"
android:paddingLeft="72dp"
android:paddingStart="72dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:focusable="true">
Expand All @@ -53,23 +53,25 @@
</HorizontalScrollView>
<LinearLayout
android:id="@+id/pathbar"
android:paddingRight="16dp"
android:paddingEnd="16dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="vertical"
tools:ignore="RtlSymmetry">

<HorizontalScrollView
android:scrollbars="none"
android:id="@+id/scroll1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:paddingLeft="72dp"
android:paddingStart="72dp"
android:paddingTop="5dp"
android:focusable="true">
android:focusable="true"
tools:ignore="RtlSymmetry">

<LinearLayout
android:clickable="false"
Expand Down Expand Up @@ -99,11 +101,12 @@
android:textSize="12sp"
android:paddingBottom="8dp"
android:paddingTop="5dp"
android:paddingLeft="72dp"
android:paddingStart="72dp"
android:textColor="@android:color/white"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:id="@+id/pathname" />
android:id="@+id/pathname"
tools:ignore="RtlSymmetry" />

</LinearLayout>
</FrameLayout>
Expand Down
Loading
Loading