Update ui
This commit is contained in:
@ -4,13 +4,13 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?android:attr/colorPrimaryDark"
|
||||
android:background="?android:attr/colorPrimary"
|
||||
tools:context=".ui.activities.MainActivity">
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/content_fragment"
|
||||
android:name="androidx.navigation.fragment.NavHostFragment"
|
||||
app:defaultNavHost="true"
|
||||
android:background="@color/colorPrimaryDark"
|
||||
android:background="@color/colorPrimary"
|
||||
app:navGraph="@navigation/nav_graph"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
@ -11,7 +11,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:cardElevation="4dp"
|
||||
app:cardElevation="0dp"
|
||||
app:cardCornerRadius="0dp"
|
||||
android:id="@+id/toolbar"
|
||||
android:transitionName="toolbar"
|
||||
@ -32,6 +32,7 @@
|
||||
android:src="@drawable/round_arrow_back_24"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:transitionName="action_back"
|
||||
android:background="?attr/selectableItemBackgroundBorderless"
|
||||
app:tint="@color/colorPrimaryText"
|
||||
android:layout_centerVertical="true"
|
||||
@ -51,9 +52,9 @@
|
||||
android:text="@string/app_name"
|
||||
android:gravity="center"
|
||||
android:textStyle="bold"
|
||||
android:transitionName="title"
|
||||
android:id="@+id/fragment_title"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:transitionName="fragment_title"
|
||||
android:layout_marginBottom="6dp"
|
||||
style="@style/AnotherWidget.Main.Title"/>
|
||||
</LinearLayout>
|
||||
<ImageView
|
||||
@ -76,10 +77,8 @@
|
||||
android:id="@+id/preview"
|
||||
android:animateLayoutChanges="true"
|
||||
app:cardBackgroundColor="@color/colorPrimary"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
app:cardCornerRadius="9dp"
|
||||
app:cardCornerRadius="0dp"
|
||||
app:cardElevation="0dp">
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:layout_width="match_parent"
|
||||
@ -110,11 +109,6 @@
|
||||
android:id="@+id/widget_loader" />
|
||||
</RelativeLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="16dp"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/bottom_padding" />
|
||||
</LinearLayout>
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
@ -125,7 +119,7 @@
|
||||
app:cardElevation="0dp"
|
||||
app:cardPreventCornerOverlap="true"
|
||||
app:cardCornerRadius="0dp"
|
||||
app:cardBackgroundColor="@color/colorPrimaryDark"
|
||||
app:cardBackgroundColor="@color/colorPrimary"
|
||||
android:orientation="vertical">
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/settings_fragment"
|
||||
|
@ -16,24 +16,26 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
app:cardBackgroundColor="@color/colorPrimary"
|
||||
app:cardElevation="2dp"
|
||||
app:cardElevation="0dp"
|
||||
app:cardCornerRadius="0dp"
|
||||
android:background="@color/colorPrimary"
|
||||
android:transitionName="toolbar"
|
||||
android:id="@+id/toolbar">
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp">
|
||||
android:layout_height="56dp"
|
||||
android:gravity="center_vertical">
|
||||
<ImageView
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:padding="12dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginTop="4dp"
|
||||
android:src="@drawable/round_arrow_back_24"
|
||||
app:tint="@color/colorPrimaryText"
|
||||
android:layout_centerVertical="true"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:transitionName="action_back"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginStart="8dp"
|
||||
@ -46,7 +48,8 @@
|
||||
android:text="@string/settings_title"
|
||||
android:textColor="@color/colorPrimaryText"
|
||||
android:gravity="center"
|
||||
android:transitionName="settings_title"
|
||||
android:paddingBottom="6dp"
|
||||
android:transitionName="fragment_title"
|
||||
android:textAppearance="@style/AnotherWidget.Main.Title"
|
||||
tools:ignore="RelativeOverlap" />
|
||||
</RelativeLayout>
|
||||
@ -56,13 +59,13 @@
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/scrollView"
|
||||
android:scrollbarThumbVertical="@color/colorPrimary"
|
||||
android:background="@color/colorPrimaryDark">
|
||||
android:background="@color/colorPrimary">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp">
|
||||
android:paddingBottom="48dp">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
@ -22,7 +22,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -25,7 +25,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:focusable="true"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
|
@ -16,7 +16,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -19,7 +19,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -19,7 +19,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:layout_width="match_parent"
|
||||
|
@ -19,7 +19,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:layout_width="match_parent"
|
||||
|
@ -18,7 +18,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="8dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:paddingBottom="48dp"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -14,7 +14,7 @@
|
||||
android:layout_marginRight="16dp"
|
||||
app:strokeColor="@color/cardBorder"
|
||||
android:foreground="?android:attr/selectableItemBackground"
|
||||
app:cardBackgroundColor="@color/colorPrimaryDark"
|
||||
app:cardBackgroundColor="@color/colorPrimary"
|
||||
app:cardCornerRadius="8dp">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
@ -18,7 +18,7 @@
|
||||
<fragment
|
||||
android:id="@+id/generalTabFragment"
|
||||
android:name="com.tommasoberlose.anotherwidget.ui.fragments.tabs.LayoutFragment"
|
||||
android:label="GeneralTabFragment" />
|
||||
android:label="@string/layout_settings_title" />
|
||||
<fragment
|
||||
android:id="@+id/weatherTabFragment"
|
||||
android:name="com.tommasoberlose.anotherwidget.ui.fragments.tabs.WeatherFragment"
|
||||
@ -52,9 +52,9 @@
|
||||
<fragment
|
||||
android:id="@+id/typographyTabFragment"
|
||||
android:name="com.tommasoberlose.anotherwidget.ui.fragments.tabs.TypographyFragment"
|
||||
android:label="TypographyTabFragment" />
|
||||
android:label="@string/typography_settings_title" />
|
||||
<fragment
|
||||
android:id="@+id/gesturesFragment"
|
||||
android:name="com.tommasoberlose.anotherwidget.ui.fragments.tabs.GesturesFragment"
|
||||
android:label="GesturesFragment" />
|
||||
android:label="@string/gestures_settings_title" />
|
||||
</navigation>
|
Reference in New Issue
Block a user