karolina/text-basic
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented navigation component; deleting an entry now shows a snack bar that allows for undo; edited several layouts

Browse Source
This commit is contained in:
denizk0461
2023-05-15 15:18:47 +02:00
parent e0e7a4cbe0
commit a7356bc97d
15 changed files with 288 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_main.xml
+26 -81
View File
@@ -1,89 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:tools="http://schemas.android.com/tools"
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="8dp"
tools:context=".activity.MainActivity"
android:orientation="vertical"
android:backgroundTint="?attr/colorTintBackground">
android:fitsSystemWindows="true"
tools:context=".activity.MainActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment_content_main"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:navGraph="@navigation/main_nav_graph"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/nav_view"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/app_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textSize="26sp"
android:textColor="?attr/colorPrimary"
android:layout_marginVertical="8dp"
android:fontFamily="@font/mono_bold_italic"
android:layout_gravity="center_horizontal"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:menu="@menu/nav_items"
app:labelVisibilityMode="selected"
app:itemTextColor="?attr/colorOnSurfaceVariant"
android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<ImageView
android:id="@+id/button_backup_upload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/cloud_upload"
android:padding="4dp"
android:layout_marginEnd="16dp"
app:layout_constraintTop_toTopOf="@id/app_title"
app:layout_constraintBottom_toBottomOf="@id/app_title"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"/>
<ImageView
android:id="@+id/button_backup_download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/cloud_download"
android:padding="4dp"
android:layout_marginStart="16dp"
app:layout_constraintTop_toTopOf="@id/app_title"
app:layout_constraintBottom_toBottomOf="@id/app_title"
app:layout_constraintStart_toStartOf="parent"
android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraint_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:menu="@menu/nav_items"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:labelVisibilityMode="selected"/>
<!-- android:background="?attr/colorPrimary"-->
<!-- app:itemIconTint="@color/bottom_nav_color"-->
<!-- app:itemTextColor="@color/bottom_nav_color"-->
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_container"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_nav"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_quote.xml
+37 -19
View File
@@ -1,34 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/quote_constraint_layout"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true">
tools:context=".fragment.QuoteFragment">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<TextView
android:id="@+id/app_title_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/quote_fragment_title"
android:textSize="28sp"
android:fontFamily="@font/mono_bold_italic"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed"/>
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/quote_scroller"
android:layout_width="0dp"
android:layout_height="0dp"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:paddingBottom="84dp"
android:clipToPadding="false"
android:layout_marginHorizontal="8dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
android:scrollbarStyle="outsideOverlay"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:layoutAnimation="@anim/layout_animation_fall_down"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_fab"
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_add_quote"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:backgroundTint="?attr/colorOnPrimary"
android:src="@drawable/add"
app:tint="?attr/colorPrimary"/>
android:text="@string/quote_fragment_fab_add"
app:icon="@drawable/add"/>
<!-- app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlayExtended"-->
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/quote_entry.xml
+37 -12
View File
@@ -3,39 +3,64 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp">
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="4dp">
<com.google.android.material.card.MaterialCardView
style="@style/Widget.Material3.CardView.Outlined"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="16dp">
<!-- android:backgroundTint="?attr/colorSecondary"-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:layout_marginVertical="8dp"
android:orientation="horizontal">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/quote"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/text_layout_quote"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:textCursorDrawable="@null"
android:hint="@string/enter_text"/>
<!-- android:theme="@style/ThemeOverlay.AppTheme.TextInputEditText.Outlined"-->
android:hint="@string/quote_entry_text_input_hint"
app:boxStrokeColor="@color/selector_text_input"
app:hintTextColor="@color/selector_text_input">
<androidx.appcompat.widget.AppCompatImageButton
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/edit_text_quote"
style="@style/ThemeOverlay.Material3.TextInputEditText.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/colorOnSurfaceVariant" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/delete_button"
style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/delete"
android:background="@null"
app:icon="@drawable/delete"
android:minWidth="0dp"
app:iconPadding="0dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"/>
<!-- android:tint="?attr/colorOnPrimary"-->
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
app:icon="@drawable/drag_indicator"
android:minWidth="0dp"
app:iconPadding="0dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="2dp"/>
</LinearLayout>