Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 3e8eee92 by Paktalin
Options

Refactoring in container_main

parent 38c1cff9
Inline Side-by-side
Showing with 30 additions and 57 deletions
app/src/main/res/drawable/sheet_top.xml → app/src/main/res/drawable/sheet.xml
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/sheet_color"/>
<corners android:topLeftRadius="@dimen/corner_radius"
android:topRightRadius="@dimen/corner_radius"/>
</shape>
\ No newline at end of file
<corners android:radius="5dp"/>
</shape>
app/src/main/res/drawable/sheet_bottom.xml deleted 100644 → 0
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/sheet_color"/>
<corners
android:bottomRightRadius="@dimen/corner_radius"
android:bottomLeftRadius="@dimen/corner_radius" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
......@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:openDrawer="start"
android:background="#66330E">
android:background="@color/background_color">
<FrameLayout
android:id="@+id/container_main"
......
app/src/main/res/layout/content_main.xml
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
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:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/container_main"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginLeft="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginTop="@dimen/small_margin"
android:background="@drawable/sheet_top"
android:paddingEnd="@dimen/small_padding"
android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingStart="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="match_parent"
android:background="@drawable/sheet"
android:layout_margin="@dimen/small_margin"
android:orientation="vertical">
<fragment
android:id="@+id/fragmentAddWord"
android:name="com.paktalin.vocabularynotebook.ui.fragments.AddWordFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginLeft="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginBottom="@dimen/small_margin"
app:layout_constraintBottom_toTopOf="@+id/btnSubmitLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/container_main"
android:paddingBottom="@dimen/small_padding"
android:paddingEnd="@dimen/small_padding"
android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingStart="@dimen/small_padding"
android:background="@drawable/sheet_bottom">
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginLeft="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginTop="@dimen/small_margin"/>
</android.support.v4.widget.SwipeRefreshLayout>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/small_margin"
android:layout_marginEnd="@dimen/small_margin"
android:layout_marginLeft="@dimen/small_margin"
android:layout_marginRight="@dimen/small_margin"
android:layout_marginStart="@dimen/small_margin" />
</LinearLayout>
<LinearLayout
android:id="@+id/btnSubmitLayout"
......@@ -60,7 +42,7 @@
android:background="@color/colorPrimary"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent">
android:layout_alignParentBottom="true">
<ImageButton
android:id="@+id/btnCancel"
......@@ -88,4 +70,4 @@
tools:ignore="ContentDescription" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
app/src/main/res/values/colors.xml
......@@ -6,4 +6,5 @@
<color name="sheet_color">#FAFAFA</color>
<color name="green_highlight">#69B578</color>
<color name="text_color">#000F55</color>
<color name="background_color">#66330E</color>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment