mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-12 21:42:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix white theme issues. Remove CollapsingToolbarLayout in some activities.

Browse Source
This commit is contained in:
Alex Ning 2020-04-17 18:08:30 +08:00
parent ea779ff74b
commit 372acf4cf4
8 changed files with 106 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
View File

@ -2111,7 +2111,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
mArchivedImageView.setColorFilter(mArchivedTintColor, PorterDuff.Mode.SRC_IN); mArchivedImageView.setColorFilter(mArchivedTintColor, PorterDuff.Mode.SRC_IN);
mLockedImageView.setColorFilter(mLockedTintColor, PorterDuff.Mode.SRC_IN); mLockedImageView.setColorFilter(mLockedTintColor, PorterDuff.Mode.SRC_IN);
mCrosspostImageView.setColorFilter(mCrosspostTintColor, PorterDuff.Mode.SRC_IN); mCrosspostImageView.setColorFilter(mCrosspostTintColor, PorterDuff.Mode.SRC_IN);
mAwardsTextView.setTextColor(mPostTitleColor); mAwardsTextView.setTextColor(mSecondaryTextColor);
mLinkTextView.setTextColor(mSecondaryTextColor); mLinkTextView.setTextColor(mSecondaryTextColor);
mLoadImageProgressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent)); mLoadImageProgressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent));
mNoPreviewLinkImageView.setBackgroundColor(mNoPreviewLinkBackgroundColor); mNoPreviewLinkImageView.setBackgroundColor(mNoPreviewLinkBackgroundColor);

2
app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
View File

@ -655,7 +655,7 @@ public class CustomThemeWrapper {
customTheme.postTitleColor = Color.parseColor("#000000"); customTheme.postTitleColor = Color.parseColor("#000000");
customTheme.postContentColor = Color.parseColor("#8A000000"); customTheme.postContentColor = Color.parseColor("#8A000000");
customTheme.commentColor = Color.parseColor("#000000"); customTheme.commentColor = Color.parseColor("#000000");
customTheme.buttonTextColor = Color.parseColor("#FFFFFF"); customTheme.buttonTextColor = Color.parseColor("#000000");
customTheme.backgroundColor = Color.parseColor("#FFFFFF"); customTheme.backgroundColor = Color.parseColor("#FFFFFF");
customTheme.cardViewBackgroundColor = Color.parseColor("#FFFFFF"); customTheme.cardViewBackgroundColor = Color.parseColor("#FFFFFF");
customTheme.commentBackgroundColor = Color.parseColor("#FFFFFF"); customTheme.commentBackgroundColor = Color.parseColor("#FFFFFF");

35
app/src/main/res/layout/activity_comment.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_comment_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:application=".CommentActivity"> tools:application=".CommentActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_comment_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_comment_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="?attr/homeAsUpIndicator"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -55,9 +46,9 @@
android:id="@+id/content_markdown_view_comment_activity" android:id="@+id/content_markdown_view_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:visibility="gone" /> android:visibility="gone" />
<View <View
@ -71,15 +62,15 @@
android:id="@+id/comment_edit_text_comment_activity" android:id="@+id/comment_edit_text_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:paddingBottom="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:hint="@string/write_comment_hint" android:hint="@string/write_comment_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/content_font_18" android:paddingStart="16dp"
android:background="#00000000" android:paddingEnd="16dp"
android:textColor="?attr/primaryTextColor" /> android:paddingBottom="16dp"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/content_font_18" />
</LinearLayout> </LinearLayout>

27
app/src/main/res/layout/activity_edit_comment.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_edit_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_edit_comment_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:context=".Activity.EditCommentActivity"> tools:context=".Activity.EditCommentActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_edit_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_edit_comment_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_edit_comment_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -37,13 +28,13 @@
android:id="@+id/comment_edit_text_edit_comment_activity" android:id="@+id/comment_edit_text_edit_comment_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_text_content_hint" android:hint="@string/post_text_content_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/content_font_18" android:padding="16dp"
android:background="#00000000"
android:textColor="?attr/primaryTextColor" android:textColor="?attr/primaryTextColor"
android:textSize="?attr/content_font_18"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

53
app/src/main/res/layout/activity_post_image.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_post_image_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_post_image_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:application=".PostImageActivity"> tools:application=".PostImageActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_image_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_post_image_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_image_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -46,10 +37,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/subreddit_icon_gif_image_view_post_image_activity" android:id="@+id/subreddit_icon_gif_image_view_post_image_activity"
@ -62,11 +53,11 @@
android:id="@+id/subreddit_name_text_view_post_image_activity" android:id="@+id/subreddit_name_text_view_post_image_activity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@id/rules_button_post_image_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/rules_button_post_image_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_image_activity"
android:text="@string/choose_a_subreddit" android:text="@string/choose_a_subreddit"
android:textSize="?attr/font_default" /> android:textSize="?attr/font_default" />
@ -147,13 +138,13 @@
android:id="@+id/post_title_edit_text_post_image_activity" android:id="@+id/post_title_edit_text_post_image_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_title_hint" android:hint="@string/post_title_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/title_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/title_font_18" />
<View <View
android:id="@+id/divider_3_post_image_activity" android:id="@+id/divider_3_post_image_activity"
@ -172,12 +163,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_add_a_photo_24dp" android:src="@drawable/ic_outline_add_a_photo_24dp"
app:layout_constraintTop_toTopOf="parent" app:backgroundTint="?attr/colorPrimaryLightTheme"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_image_activity"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
@ -185,12 +176,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_select_photo_24dp" android:src="@drawable/ic_outline_select_photo_24dp"
app:layout_constraintTop_toTopOf="parent" app:backgroundTint="?attr/colorPrimaryLightTheme"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintStart_toEndOf="@+id/capture_fab_post_image_activity"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -209,8 +200,8 @@
android:id="@+id/image_view_post_image_activity" android:id="@+id/image_view_post_image_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scaleType="fitStart"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitStart"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

47
app/src/main/res/layout/activity_post_link.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_post_link_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_post_link_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:application=".PostTextActivity"> tools:application=".PostTextActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_link_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_post_link_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_link_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -46,10 +37,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/subreddit_icon_gif_image_view_post_link_activity" android:id="@+id/subreddit_icon_gif_image_view_post_link_activity"
@ -62,11 +53,11 @@
android:id="@+id/subreddit_name_text_view_post_link_activity" android:id="@+id/subreddit_name_text_view_post_link_activity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@id/rules_button_post_link_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/rules_button_post_link_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_link_activity"
android:text="@string/choose_a_subreddit" android:text="@string/choose_a_subreddit"
android:textSize="?attr/font_default" /> android:textSize="?attr/font_default" />
@ -147,13 +138,13 @@
android:id="@+id/post_title_edit_text_post_link_activity" android:id="@+id/post_title_edit_text_post_link_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_title_hint" android:hint="@string/post_title_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/title_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/title_font_18" />
<View <View
android:id="@+id/divider_3_post_link_activity" android:id="@+id/divider_3_post_link_activity"
@ -165,13 +156,13 @@
android:id="@+id/post_link_edit_text_post_link_activity" android:id="@+id/post_link_edit_text_post_link_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_link_hint" android:hint="@string/post_link_hint"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:textSize="?attr/content_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/content_font_18" />
</LinearLayout> </LinearLayout>

49
app/src/main/res/layout/activity_post_text.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_post_text_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_post_text_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:application=".PostTextActivity"> tools:application=".PostTextActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_text_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_post_text_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_text_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -46,10 +37,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/subreddit_icon_gif_image_view_search_activity" android:id="@+id/subreddit_icon_gif_image_view_search_activity"
@ -62,11 +53,11 @@
android:id="@+id/subreddit_name_text_view_search_activity" android:id="@+id/subreddit_name_text_view_search_activity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@id/rules_button_post_text_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/rules_button_post_text_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_search_activity"
android:text="@string/choose_a_subreddit" android:text="@string/choose_a_subreddit"
android:textSize="?attr/font_default" /> android:textSize="?attr/font_default" />
@ -87,7 +78,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/dividerColor" /> android:background="?attr/dividerColor" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -147,13 +138,13 @@
android:id="@+id/post_title_edit_text_post_text_activity" android:id="@+id/post_title_edit_text_post_text_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_title_hint" android:hint="@string/post_title_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/title_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/title_font_18" />
<View <View
android:id="@+id/divider_3_post_text_activity" android:id="@+id/divider_3_post_text_activity"
@ -165,13 +156,13 @@
android:id="@+id/post_text_content_edit_text_post_text_activity" android:id="@+id/post_text_content_edit_text_post_text_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_text_content_hint" android:hint="@string/post_text_content_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/content_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/content_font_18" />
</LinearLayout> </LinearLayout>

51
app/src/main/res/layout/activity_post_video.xml
View File

@ -2,9 +2,9 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout_post_video_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_post_video_activity"
android:background="?attr/backgroundColor" android:background="?attr/backgroundColor"
tools:application=".PostImageActivity"> tools:application=".PostImageActivity">
@ -15,21 +15,12 @@
android:background="?attr/toolbarAndTabBackgroundColor" android:background="?attr/toolbarAndTabBackgroundColor"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.appbar.CollapsingToolbarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_video_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" app:navigationIcon="?attr/homeAsUpIndicator"
app:titleEnabled="false" app:popupTheme="@style/AppTheme.PopupOverlay" />
app:toolbarId="@+id/toolbar_post_text_activity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar_post_video_activity"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
@ -46,10 +37,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/subreddit_icon_gif_image_view_post_video_activity" android:id="@+id/subreddit_icon_gif_image_view_post_video_activity"
@ -62,11 +53,11 @@
android:id="@+id/subreddit_name_text_view_post_video_activity" android:id="@+id/subreddit_name_text_view_post_video_activity"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@id/rules_button_post_video_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/rules_button_post_video_activity"
android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_video_activity"
android:text="@string/choose_a_subreddit" android:text="@string/choose_a_subreddit"
android:textSize="?attr/font_default" /> android:textSize="?attr/font_default" />
@ -147,13 +138,13 @@
android:id="@+id/post_title_edit_text_post_video_activity" android:id="@+id/post_title_edit_text_post_video_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000"
android:gravity="top" android:gravity="top"
android:padding="16dp"
android:hint="@string/post_title_hint" android:hint="@string/post_title_hint"
android:inputType="textCapSentences|textMultiLine" android:inputType="textCapSentences|textMultiLine"
android:textSize="?attr/title_font_18" android:padding="16dp"
android:background="#00000000" android:textColor="?attr/primaryTextColor"
android:textColor="?attr/primaryTextColor" /> android:textSize="?attr/title_font_18" />
<View <View
android:id="@+id/divider_3_post_video_activity" android:id="@+id/divider_3_post_video_activity"
@ -172,12 +163,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_add_a_photo_24dp" android:src="@drawable/ic_outline_add_a_photo_24dp"
app:layout_constraintTop_toTopOf="parent" app:backgroundTint="?attr/colorPrimaryLightTheme"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
@ -185,12 +176,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_outline_select_photo_24dp" android:src="@drawable/ic_outline_select_photo_24dp"
app:layout_constraintTop_toTopOf="parent" app:backgroundTint="?attr/colorPrimaryLightTheme"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_chainStyle="spread"
app:backgroundTint="?attr/colorPrimaryLightTheme" app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
app:layout_constraintTop_toTopOf="parent"
app:tint="@android:color/white" /> app:tint="@android:color/white" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>