Makes the toolbar shadow visible for pre-Lollipop android versions and fixes a crash when deleting a draft with no media attached.
parent
c7f3354c40
commit
384c377129
@ -1,5 +0,0 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
<item android:color="@color/button_dark" android:state_checked="true" /> |
||||
<item android:color="?material_drawer_primary_icon" /> |
||||
</selector> |
@ -1,88 +1,80 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<android.support.design.widget.CoordinatorLayout |
||||
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" |
||||
tools:context="com.keylesspalace.tusky.AboutActivity"> |
||||
|
||||
<LinearLayout |
||||
<include layout="@layout/toolbar_basic" /> |
||||
|
||||
<ScrollView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:orientation="vertical"> |
||||
android:layout_height="wrap_content" |
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"> |
||||
|
||||
<android.support.v7.widget.Toolbar |
||||
android:id="@+id/toolbar" |
||||
<LinearLayout |
||||
android:layout_width="match_parent" |
||||
android:layout_height="?attr/actionBarSize" |
||||
android:background="?attr/toolbar_background_color" |
||||
android:elevation="4dp" /> |
||||
android:layout_height="wrap_content" |
||||
android:orientation="vertical" |
||||
android:gravity="center" |
||||
android:paddingTop="16dp" |
||||
android:paddingBottom="16dp"> |
||||
|
||||
<ScrollView |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content"> |
||||
<ImageView |
||||
android:id="@+id/logo" |
||||
android:layout_width="200dp" |
||||
android:layout_height="200dp" |
||||
android:src="@mipmap/ic_logo" |
||||
android:contentDescription="@null" /> |
||||
|
||||
<LinearLayout |
||||
android:layout_width="match_parent" |
||||
<TextView |
||||
android:id="@+id/versionTV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:orientation="vertical" |
||||
android:gravity="center" |
||||
android:paddingTop="16dp" |
||||
android:paddingBottom="16dp"> |
||||
|
||||
<ImageView |
||||
android:id="@+id/logo" |
||||
android:layout_width="200dp" |
||||
android:layout_height="200dp" |
||||
android:src="@mipmap/ic_logo" |
||||
android:contentDescription="@null" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/versionTV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:paddingTop="8dp" |
||||
android:textIsSelectable="true" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large" /> |
||||
android:paddingTop="8dp" |
||||
android:textIsSelectable="true" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/projectURL_TV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:autoLink="web" |
||||
android:textIsSelectable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_project_site" |
||||
android:textAlignment="center" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> |
||||
<TextView |
||||
android:id="@+id/projectURL_TV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:autoLink="web" |
||||
android:textIsSelectable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_project_site" |
||||
android:textAlignment="center" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/featuresURL_TV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:autoLink="web" |
||||
android:textIsSelectable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_bug_feature_request_site" |
||||
android:textAlignment="center" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> |
||||
<TextView |
||||
android:id="@+id/featuresURL_TV" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:autoLink="web" |
||||
android:textIsSelectable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_bug_feature_request_site" |
||||
android:textAlignment="center" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> |
||||
|
||||
<Button |
||||
android:id="@+id/tusky_profile_button" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:clickable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_tusky_account" |
||||
android:textAlignment="center" |
||||
android:textAllCaps="false" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" |
||||
android:textColor="@android:color/white" /> |
||||
<Button |
||||
android:id="@+id/tusky_profile_button" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:clickable="true" |
||||
android:padding="@dimen/text_content_margin" |
||||
android:text="@string/about_tusky_account" |
||||
android:textAlignment="center" |
||||
android:textAllCaps="false" |
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" |
||||
android:textColor="@android:color/white" /> |
||||
|
||||
</LinearLayout> |
||||
</LinearLayout> |
||||
|
||||
</ScrollView> |
||||
</ScrollView> |
||||
|
||||
</LinearLayout> |
||||
<include layout="@layout/toolbar_shadow_shim" /> |
||||
|
||||
</android.support.design.widget.CoordinatorLayout> |
@ -1,36 +1,25 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<android.support.design.widget.CoordinatorLayout |
||||
xmlns:android="http://schemas.android.com/apk/res/android" |
||||
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:tools="http://schemas.android.com/tools" |
||||
xmlns:app="http://schemas.android.com/apk/res-auto" |
||||
android:id="@+id/activity_view_thread" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
tools:context="com.keylesspalace.tusky.FavouritesActivity"> |
||||
|
||||
<LinearLayout |
||||
<include layout="@layout/toolbar_basic" /> |
||||
|
||||
<FrameLayout |
||||
android:id="@+id/fragment_container" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" |
||||
android:orientation="vertical"> |
||||
|
||||
<android.support.v7.widget.Toolbar |
||||
android:id="@+id/toolbar" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="?attr/actionBarSize" |
||||
android:elevation="4dp" |
||||
android:background="?attr/toolbar_background_color" /> |
||||
|
||||
<FrameLayout |
||||
android:id="@+id/fragment_container" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" /> |
||||
|
||||
</LinearLayout> |
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> |
||||
|
||||
<FrameLayout |
||||
android:id="@+id/overlay_fragment_container" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent"> |
||||
android:layout_height="match_parent" /> |
||||
|
||||
</FrameLayout> |
||||
<include layout="@layout/toolbar_shadow_shim" /> |
||||
|
||||
</android.support.design.widget.CoordinatorLayout> |
@ -0,0 +1,20 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:app="http://schemas.android.com/apk/res-auto"> |
||||
|
||||
<android.support.design.widget.AppBarLayout |
||||
android:layout_width="match_parent" |
||||
android:layout_height="wrap_content" |
||||
android:stateListAnimator="@null" |
||||
android:elevation="0dp" |
||||
app:layout_collapseMode="pin"> |
||||
|
||||
<android.support.v7.widget.Toolbar |
||||
android:id="@+id/toolbar" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="?attr/actionBarSize" |
||||
android:background="?attr/toolbar_background_color" /> |
||||
|
||||
</android.support.design.widget.AppBarLayout> |
||||
|
||||
</merge> |
@ -0,0 +1,13 @@ |
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:app="http://schemas.android.com/apk/res-auto"> |
||||
|
||||
<View |
||||
android:id="@+id/toolbar_shadow_shim" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="4dp" |
||||
android:background="@drawable/material_drawer_shadow_bottom" |
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" |
||||
app:layout_collapseMode="pin" /> |
||||
|
||||
</merge> |
Loading…
Reference in new issue