MetuFSS
/
metu.life-android
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makes the toolbar shadow visible for pre-Lollipop android versions and fixes a crash when deleting a draft with no media attached.

Browse Source
main
Vavassor 7 years ago
parent c7f3354c40
commit 384c377129
17 changed files with 194 additions and 207 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java
  2. 5
      app/src/main/res/color/drawer_visibility_panel_item.xml
  3. 3
      app/src/main/res/drawable/ic_mute_24dp.xml
  4. 3
      app/src/main/res/drawable/ic_unmute_24dp.xml
  5. 124
      app/src/main/res/layout/activity_about.xml
  6. 25
      app/src/main/res/layout/activity_account_list.xml
  7. 3
      app/src/main/res/layout/activity_compose.xml
  8. 15
      app/src/main/res/layout/activity_edit_profile.xml
  9. 29
      app/src/main/res/layout/activity_favourites.xml
  10. 21
      app/src/main/res/layout/activity_report.xml
  11. 18
      app/src/main/res/layout/activity_saved_toot.xml
  12. 65
      app/src/main/res/layout/activity_search.xml
  13. 22
      app/src/main/res/layout/activity_view_tag.xml
  14. 24
      app/src/main/res/layout/activity_view_thread.xml
  15. 1
      app/src/main/res/layout/activity_view_video.xml
  16. 20
      app/src/main/res/layout/toolbar_basic.xml
  17. 13
      app/src/main/res/layout/toolbar_shadow_shim.xml

10
app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java
Unescape View File

@ -131,10 +131,12 @@ public class SavedTootActivity extends BaseActivity implements SavedTootAdapter.
// Delete any media files associated with the status. // Delete any media files associated with the status.
ArrayList<String> uris = new Gson().fromJson(item.getUrls(), ArrayList<String> uris = new Gson().fromJson(item.getUrls(),
new TypeToken<ArrayList<String>>() {}.getType()); new TypeToken<ArrayList<String>>() {}.getType());
for (String uriString : uris) { if (uris != null) {
Uri uri = Uri.parse(uriString); for (String uriString : uris) {
if (getContentResolver().delete(uri, null, null) == 0) { Uri uri = Uri.parse(uriString);
Log.e(TAG, String.format("Did not delete file %s.", uriString)); if (getContentResolver().delete(uri, null, null) == 0) {
Log.e(TAG, String.format("Did not delete file %s.", uriString));
}
} }
} }
// update DB // update DB

5
app/src/main/res/color/drawer_visibility_panel_item.xml
Unescape View File

@ -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>

3
app/src/main/res/drawable/ic_mute_24dp.xml
Unescape View File

@ -1,5 +1,6 @@
<vector android:height="24dp" android:viewportHeight="35.43307" <vector android:height="24dp" android:viewportHeight="35.43307"
android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true">
<path android:fillAlpha="1" android:fillColor="#ffffff" <path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z" android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z"
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeAlpha="1" android:strokeColor="#00000000"

3
app/src/main/res/drawable/ic_unmute_24dp.xml
Unescape View File

@ -1,5 +1,6 @@
<vector android:height="24dp" android:viewportHeight="35.43307" <vector android:height="24dp" android:viewportHeight="35.43307"
android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="35.43307" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true">
<path android:fillAlpha="1" android:fillColor="#ffffff" <path android:fillAlpha="1" android:fillColor="#ffffff"
android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z" android:pathData="m17.72,3.54 l-8.86,8.86 -7.09,0 0,10.63 7.09,0 8.86,8.86z"
android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeAlpha="1" android:strokeColor="#00000000"

124
app/src/main/res/layout/activity_about.xml
Unescape View File

@ -1,88 +1,80 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.AboutActivity"> tools:context="com.keylesspalace.tusky.AboutActivity">
<LinearLayout <include layout="@layout/toolbar_basic" />
<ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v7.widget.Toolbar <LinearLayout
android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
android:background="?attr/toolbar_background_color" android:orientation="vertical"
android:elevation="4dp" /> android:gravity="center"
android:paddingTop="16dp"
android:paddingBottom="16dp">
<ScrollView <ImageView
android:layout_width="match_parent" android:id="@+id/logo"
android:layout_height="wrap_content"> android:layout_width="200dp"
android:layout_height="200dp"
android:src="@mipmap/ic_logo"
android:contentDescription="@null" />
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/versionTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:paddingTop="8dp"
android:gravity="center" android:textIsSelectable="true"
android:paddingTop="16dp" android:textAppearance="@style/TextAppearance.AppCompat.Large" />
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" />
<TextView <TextView
android:id="@+id/projectURL_TV" android:id="@+id/projectURL_TV"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autoLink="web" android:autoLink="web"
android:textIsSelectable="true" android:textIsSelectable="true"
android:padding="@dimen/text_content_margin" android:padding="@dimen/text_content_margin"
android:text="@string/about_project_site" android:text="@string/about_project_site"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<TextView <TextView
android:id="@+id/featuresURL_TV" android:id="@+id/featuresURL_TV"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autoLink="web" android:autoLink="web"
android:textIsSelectable="true" android:textIsSelectable="true"
android:padding="@dimen/text_content_margin" android:padding="@dimen/text_content_margin"
android:text="@string/about_bug_feature_request_site" android:text="@string/about_bug_feature_request_site"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<Button <Button
android:id="@+id/tusky_profile_button" android:id="@+id/tusky_profile_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:padding="@dimen/text_content_margin" android:padding="@dimen/text_content_margin"
android:text="@string/about_tusky_account" android:text="@string/about_tusky_account"
android:textAlignment="center" android:textAlignment="center"
android:textAllCaps="false" android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/white" /> android:textColor="@android:color/white" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> <include layout="@layout/toolbar_shadow_shim" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

25
app/src/main/res/layout/activity_account_list.xml
Unescape View File

@ -1,30 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread" android:id="@+id/activity_view_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.AccountListActivity"> tools:context="com.keylesspalace.tusky.AccountListActivity">
<LinearLayout <include layout="@layout/toolbar_basic" />
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<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> <include layout="@layout/toolbar_shadow_shim" />
<FrameLayout <FrameLayout
android:id="@+id/overlay_fragment_container" android:id="@+id/overlay_fragment_container"

3
app/src/main/res/layout/activity_compose.xml
Unescape View File

@ -16,8 +16,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent" />
android:elevation="4dp" />
<LinearLayout <LinearLayout
android:id="@+id/compose_content_warning_bar" android:id="@+id/compose_content_warning_bar"

15
app/src/main/res/layout/activity_edit_profile.xml
Unescape View File

@ -7,22 +7,18 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.EditProfileActivity"> tools:context="com.keylesspalace.tusky.EditProfileActivity">
<include layout="@layout/toolbar_basic" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<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:elevation="4dp" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -81,6 +77,7 @@
android:elevation="4dp" android:elevation="4dp"
android:background="@drawable/round_button" android:background="@drawable/round_button"
android:contentDescription="@string/label_avatar" /> android:contentDescription="@string/label_avatar" />
</RelativeLayout> </RelativeLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
@ -122,6 +119,8 @@
</ScrollView> </ScrollView>
<include layout="@layout/toolbar_shadow_shim" />
<ProgressBar <ProgressBar
android:id="@+id/edit_profile_save_progress" android:id="@+id/edit_profile_save_progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"

29
app/src/main/res/layout/activity_favourites.xml
Unescape View File

@ -1,36 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread" android:id="@+id/activity_view_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.FavouritesActivity"> 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<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>
<FrameLayout <FrameLayout
android:id="@+id/overlay_fragment_container" android:id="@+id/overlay_fragment_container"
android:layout_width="match_parent" 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> </android.support.design.widget.CoordinatorLayout>

21
app/src/main/res/layout/activity_report.xml
Unescape View File

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<include layout="@layout/toolbar_basic" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
<android.support.v7.widget.Toolbar app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:elevation="4dp"
android:background="?attr/toolbar_background_color" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -38,4 +36,7 @@
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:hint="@string/report_comment_hint" /> android:hint="@string/report_comment_hint" />
</LinearLayout> </LinearLayout>
<include layout="@layout/toolbar_shadow_shim" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

18
app/src/main/res/layout/activity_saved_toot.xml
Unescape View File

@ -1,22 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?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:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread" android:id="@+id/activity_view_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.AccountListActivity"> tools:context="com.keylesspalace.tusky.AccountListActivity">
<include layout="@layout/toolbar_basic" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<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:elevation="4dp" />
<TextView <TextView
android:id="@+id/no_content" android:id="@+id/no_content"
@ -29,10 +25,10 @@
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:layout_below="@+id/toolbar" />
</RelativeLayout> </RelativeLayout>
<include layout="@layout/toolbar_shadow_shim" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

65
app/src/main/res/layout/activity_search.xml
Unescape View File

@ -6,10 +6,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="com.keylesspalace.tusky.SearchActivity"> tools:context="com.keylesspalace.tusky.SearchActivity">
<LinearLayout <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"> android:stateListAnimator="@null"
android:elevation="0dp"
app:layout_collapseMode="pin">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -19,33 +21,36 @@
app:navigationIcon="?attr/homeAsUpIndicator" app:navigationIcon="?attr/homeAsUpIndicator"
app:contentInsetStartWithNavigation="0dp" /> app:contentInsetStartWithNavigation="0dp" />
<RelativeLayout </android.support.design.widget.AppBarLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:id="@+id/recycler_view" />
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent" <ProgressBar
android:layout_height="match_parent" android:layout_width="wrap_content"
android:id="@+id/recycler_view" /> android:layout_height="wrap_content"
android:id="@+id/progress_bar"
<ProgressBar android:layout_centerInParent="true"
android:layout_width="wrap_content" android:indeterminate="true"
android:layout_height="wrap_content" android:visibility="gone" />
android:id="@+id/progress_bar"
android:layout_centerInParent="true" <TextView
android:indeterminate="true" android:layout_width="wrap_content"
android:visibility="gone" /> android:layout_height="wrap_content"
android:id="@+id/message_no_results"
<TextView android:text="@string/search_no_results"
android:layout_width="wrap_content" android:layout_centerInParent="true"
android:layout_height="wrap_content" android:visibility="gone" />
android:id="@+id/message_no_results"
android:text="@string/search_no_results" </RelativeLayout>
android:layout_centerInParent="true"
android:visibility="gone" /> <include layout="@layout/toolbar_shadow_shim" />
</RelativeLayout>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

22
app/src/main/res/layout/activity_view_tag.xml
Unescape View File

@ -1,29 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?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:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread" android:id="@+id/activity_view_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.ViewTagActivity"> tools:context="com.keylesspalace.tusky.ViewTagActivity">
<LinearLayout <include layout="@layout/toolbar_basic" />
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<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> <include layout="@layout/toolbar_shadow_shim" />
<FrameLayout <FrameLayout
android:id="@+id/overlay_fragment_container" android:id="@+id/overlay_fragment_container"

24
app/src/main/res/layout/activity_view_thread.xml
Unescape View File

@ -1,29 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/activity_view_thread" android:id="@+id/activity_view_thread"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.keylesspalace.tusky.ViewThreadActivity"> tools:context="com.keylesspalace.tusky.ViewThreadActivity">
<LinearLayout <include layout="@layout/toolbar_basic" />
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<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 <include layout="@layout/toolbar_shadow_shim" />
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/overlay_fragment_container" android:id="@+id/overlay_fragment_container"

1
app/src/main/res/layout/activity_view_video.xml
Unescape View File

@ -25,6 +25,5 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:theme="@style/AppTheme.Account.AppBarLayout" android:theme="@style/AppTheme.Account.AppBarLayout"
app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark" app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
android:elevation="4dp"
android:background="@color/semi_transparent" /> android:background="@color/semi_transparent" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

20
app/src/main/res/layout/toolbar_basic.xml
Unescape View File

@ -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>

13
app/src/main/res/layout/toolbar_shadow_shim.xml
Unescape View File

@ -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>
Write Preview
Loading…
Cancel
Save