mirror of
https://github.com/M66B/FairEmail.git
synced 2025-01-19 13:48:58 +00:00
Removed framelayout
This commit is contained in:
parent
f7d0302192
commit
805444d99a
1 changed files with 140 additions and 146 deletions
|
@ -6,169 +6,163 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".ActivityView">
|
tools:context=".ActivityView">
|
||||||
|
|
||||||
<FrameLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:layout_above="@+id/multiple">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<TextView
|
||||||
|
android:id="@+id/tvSupport"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:padding="6dp"
|
||||||
|
android:text="@string/title_pro_support"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/vSeparatorSupport"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="1dp"
|
||||||
|
android:background="?attr/colorSeparator"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tvSupport" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvSupport"
|
android:id="@+id/tvHintSupport"
|
||||||
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:gravity="center_vertical"
|
||||||
android:padding="6dp"
|
android:minHeight="33dp"
|
||||||
android:text="@string/title_pro_support"
|
android:padding="6dp"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:text="@string/title_hint_support"
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintEnd_toStartOf="@+id/ibHintSupport"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
|
||||||
|
|
||||||
<View
|
<ImageButton
|
||||||
android:id="@+id/vSeparatorSupport"
|
android:id="@+id/ibHintSupport"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="1dp"
|
android:layout_height="wrap_content"
|
||||||
android:background="?attr/colorSeparator"
|
android:src="@drawable/baseline_close_24"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintBottom_toBottomOf="@id/tvHintSupport"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSupport" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/tvHintSupport" />
|
||||||
|
|
||||||
<TextView
|
<View
|
||||||
android:id="@+id/tvHintSupport"
|
android:id="@+id/vSeparatorHintSupport"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="1dp"
|
||||||
android:gravity="center_vertical"
|
android:background="?attr/colorSeparator"
|
||||||
android:minHeight="33dp"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:padding="6dp"
|
app:layout_constraintTop_toBottomOf="@id/ibHintSupport" />
|
||||||
android:text="@string/title_hint_support"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/ibHintSupport"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparatorSupport" />
|
|
||||||
|
|
||||||
<ImageButton
|
<TextView
|
||||||
android:id="@+id/ibHintSupport"
|
android:id="@+id/tvHintActions"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:src="@drawable/baseline_close_24"
|
android:gravity="center_vertical"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/tvHintSupport"
|
android:minHeight="33dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:padding="6dp"
|
||||||
app:layout_constraintTop_toTopOf="@id/tvHintSupport" />
|
android:text="@string/title_hint_message_actions"
|
||||||
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/ibHintActions"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" />
|
||||||
|
|
||||||
<View
|
<ImageButton
|
||||||
android:id="@+id/vSeparatorHintSupport"
|
android:id="@+id/ibHintActions"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="1dp"
|
android:layout_height="wrap_content"
|
||||||
android:background="?attr/colorSeparator"
|
android:src="@drawable/baseline_close_24"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintBottom_toBottomOf="@id/tvHintActions"
|
||||||
app:layout_constraintTop_toBottomOf="@id/ibHintSupport" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/tvHintActions" />
|
||||||
|
|
||||||
<TextView
|
<View
|
||||||
android:id="@+id/tvHintActions"
|
android:id="@+id/vSeparatorHintActions"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="1dp"
|
||||||
android:gravity="center_vertical"
|
android:background="?attr/colorSeparator"
|
||||||
android:minHeight="33dp"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
android:padding="6dp"
|
app:layout_constraintTop_toBottomOf="@id/tvHintActions" />
|
||||||
android:text="@string/title_hint_message_actions"
|
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/ibHintActions"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintSupport" />
|
|
||||||
|
|
||||||
<ImageButton
|
<TextView
|
||||||
android:id="@+id/ibHintActions"
|
android:id="@+id/tvNoEmail"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:src="@drawable/baseline_close_24"
|
android:text="@string/title_no_messages"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/tvHintActions"
|
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
||||||
app:layout_constraintTop_toTopOf="@id/tvHintActions" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<View
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/vSeparatorHintActions"
|
android:id="@+id/rvFolder"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="1dp"
|
android:layout_height="0dp"
|
||||||
android:background="?attr/colorSeparator"
|
android:scrollbarStyle="outsideOverlay"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
android:scrollbars="vertical"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvHintActions" />
|
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintActions" />
|
||||||
|
|
||||||
<TextView
|
<ProgressBar
|
||||||
android:id="@+id/tvNoEmail"
|
android:id="@+id/pbWait"
|
||||||
android:layout_width="wrap_content"
|
style="@style/Base.Widget.AppCompat.ProgressBar"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:text="@string/title_no_messages"
|
android:layout_height="wrap_content"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
android:indeterminate="true"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||||
android:id="@+id/rvFolder"
|
android:id="@+id/bottom_navigation"
|
||||||
android:layout_width="0dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="28dp"
|
||||||
android:scrollbarStyle="outsideOverlay"
|
android:background="?attr/colorSeparator"
|
||||||
android:scrollbars="vertical"
|
app:itemIconTint="@color/bottomnav_background"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
app:itemTextColor="@color/bottomnav_background"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:labelVisibilityMode="unlabeled"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/vSeparatorHintActions" />
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:menu="@menu/action_messages" />
|
||||||
|
|
||||||
<ProgressBar
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/pbWait"
|
android:id="@+id/grpSupport"
|
||||||
style="@style/Base.Widget.AppCompat.ProgressBar"
|
android:layout_width="0dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="0dp"
|
||||||
android:layout_height="wrap_content"
|
app:constraint_referenced_ids="tvSupport,vSeparatorSupport" />
|
||||||
android:indeterminate="true"
|
|
||||||
app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/bottom_navigation"
|
android:id="@+id/grpHintSupport"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="28dp"
|
android:layout_height="0dp"
|
||||||
android:background="?attr/colorSeparator"
|
app:constraint_referenced_ids="tvHintSupport,ibHintSupport,vSeparatorHintSupport" />
|
||||||
app:itemIconTint="@color/bottomnav_background"
|
|
||||||
app:itemTextColor="@color/bottomnav_background"
|
|
||||||
app:labelVisibilityMode="unlabeled"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:menu="@menu/action_messages" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/grpSupport"
|
android:id="@+id/grpHintActions"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:constraint_referenced_ids="tvSupport,vSeparatorSupport" />
|
app:constraint_referenced_ids="tvHintActions,ibHintActions,vSeparatorHintActions" />
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
<androidx.constraintlayout.widget.Group
|
||||||
android:id="@+id/grpHintSupport"
|
android:id="@+id/grpReady"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
app:constraint_referenced_ids="tvHintSupport,ibHintSupport,vSeparatorHintSupport" />
|
app:constraint_referenced_ids="rvFolder" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
<androidx.constraintlayout.widget.Group
|
|
||||||
android:id="@+id/grpHintActions"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:constraint_referenced_ids="tvHintActions,ibHintActions,vSeparatorHintActions" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Group
|
|
||||||
android:id="@+id/grpReady"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:constraint_referenced_ids="rvFolder" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
</FrameLayout>
|
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/fab"
|
android:id="@+id/fab"
|
||||||
|
|
Loading…
Reference in a new issue