aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--app/src/main/res/layout/activity_edit_profile.xml80
-rw-r--r--app/src/main/res/layout/activity_post_gallery.xml22
-rw-r--r--app/src/main/res/layout/activity_post_image.xml22
-rw-r--r--app/src/main/res/layout/activity_post_link.xml22
-rw-r--r--app/src/main/res/layout/activity_post_text.xml22
-rw-r--r--app/src/main/res/layout/activity_post_video.xml32
-rw-r--r--app/src/main/res/menu/edit_profile_activity.xml2
-rw-r--r--app/src/main/res/values/strings.xml5
8 files changed, 74 insertions, 133 deletions
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index 453ad5c4..47d6aba3 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -13,14 +13,23 @@
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar_view_edit_profile_activity"
+ <com.google.android.material.appbar.CollapsingToolbarLayout
+ android:id="@+id/collapsing_toolbar_layout_edit_profile_activity"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?attr/actionBarSize"
- app:navigationIcon="?attr/homeAsUpIndicator"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- app:title="@string/action_edit_profile" />
+ android:layout_height="match_parent"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:titleEnabled="false"
+ app:toolbarId="@+id/toolbar_post_text_activity">
+
+ <com.google.android.material.appbar.MaterialToolbar
+ android:id="@+id/toolbar_view_edit_profile_activity"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ app:navigationIcon="?attr/homeAsUpIndicator"
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+ </com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
@@ -42,14 +51,12 @@
<FrameLayout
android:id="@+id/frame_layout_view_banner_edit_profile_activity"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="8dp">
+ android:layout_height="wrap_content">
- <ImageView
+ <pl.droidsonroids.gif.GifImageView
android:id="@+id/image_view_banner_edit_profile_activity"
android:layout_width="match_parent"
android:layout_height="180dp"
- android:contentDescription="@null"
android:scaleType="centerCrop"
tools:src="@tools:sample/backgrounds/scenic" />
@@ -68,17 +75,16 @@
<FrameLayout
android:id="@+id/frame_layout_view_avatar_edit_profile_activity"
- android:layout_width="74dp"
- android:layout_height="74dp"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
android:layout_marginStart="24dp"
android:layout_marginTop="143dp"
android:elevation="4dp">
- <ImageView
+ <pl.droidsonroids.gif.GifImageView
android:id="@+id/image_view_avatar_edit_profile_activity"
- android:layout_width="74dp"
- android:layout_height="74dp"
- android:contentDescription="@null"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
tools:src="@tools:sample/avatars" />
<ImageView
@@ -96,22 +102,17 @@
</FrameLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_margin="8dp"
- android:background="?dividerVertical" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:orientation="vertical"
- android:padding="8dp">
+ android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingTop="48dp"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
android:fontFamily="?attr/font_family"
android:text="@string/display_name_text"
android:textSize="?attr/font_18" />
@@ -120,20 +121,19 @@
android:id="@+id/edit_text_display_name_edit_profile_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="16dp"
android:gravity="top"
+ android:background="#00000000"
android:hint="@string/display_name_hint"
android:importantForAutofill="no"
android:inputType="textCapSentences"
- android:lines="1"
- android:maxLength="30"
- android:maxLines="1"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:paddingBottom="16dp" />
+ android:maxLength="30" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
android:text="@string/display_name_description" />
</LinearLayout>
@@ -141,13 +141,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:orientation="vertical"
- android:padding="8dp">
+ android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingTop="48dp"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
android:fontFamily="?attr/font_family"
android:text="@string/about_you_text"
android:textSize="?attr/font_18" />
@@ -156,16 +157,13 @@
android:id="@+id/edit_text_about_you_edit_profile_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="16dp"
android:gravity="top"
+ android:background="#00000000"
android:hint="@string/about_you_hint"
android:importantForAutofill="no"
android:inputType="textCapSentences|textMultiLine"
- android:lines="4"
- android:maxLength="200"
- android:maxLines="4"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:paddingBottom="16dp" />
+ android:maxLength="200" />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml
index b66d0c34..66fd39ac 100644
--- a/app/src/main/res/layout/activity_post_gallery.xml
+++ b/app/src/main/res/layout/activity_post_gallery.xml
@@ -73,10 +73,10 @@
</RelativeLayout>
- <View
+ <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_1_post_gallery_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -127,17 +127,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_2_post_gallery_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<LinearLayout
android:id="@+id/receive_post_reply_notifications_linear_layout_post_gallery_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
@@ -164,10 +157,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_3_post_gallery_activity"
+ <com.google.android.material.divider.MaterialDivider
+ android:id="@+id/divider_2_post_gallery_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<EditText
android:id="@+id/post_title_edit_text_post_gallery_activity"
@@ -182,11 +175,6 @@
android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" />
- <View
- android:id="@+id/divider_4_post_gallery_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/images_recycler_view_post_gallery_activity"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index a73dfcf4..fc4c15cd 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -73,10 +73,10 @@
</RelativeLayout>
- <View
+ <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_1_post_image_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -127,17 +127,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_2_post_image_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<LinearLayout
android:id="@+id/receive_post_reply_notifications_linear_layout_post_image_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
@@ -164,10 +157,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_3_post_image_activity"
+ <com.google.android.material.divider.MaterialDivider
+ android:id="@+id/divider_2_post_image_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<EditText
android:id="@+id/post_title_edit_text_post_image_activity"
@@ -182,11 +175,6 @@
android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" />
- <View
- android:id="@+id/divider_4_post_image_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/select_image_constraint_layout_post_image_activity"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index f7a26366..29c33d4b 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -73,10 +73,10 @@
</RelativeLayout>
- <View
+ <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_1_post_link_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -127,17 +127,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_2_post_link_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<LinearLayout
android:id="@+id/receive_post_reply_notifications_linear_layout_post_link_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
@@ -164,10 +157,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_3_post_link_activity"
+ <com.google.android.material.divider.MaterialDivider
+ android:id="@+id/divider_2_post_link_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -201,11 +194,6 @@
</LinearLayout>
- <View
- android:id="@+id/divider_4_post_link_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<EditText
android:id="@+id/post_link_edit_text_post_link_activity"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index e6c1a366..78728545 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -79,10 +79,10 @@
</RelativeLayout>
- <View
+ <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_1_post_text_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -130,17 +130,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_2_post_text_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<LinearLayout
android:id="@+id/receive_post_reply_notifications_linear_layout_post_text_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
@@ -167,10 +160,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_3_post_text_activity"
+ <com.google.android.material.divider.MaterialDivider
+ android:id="@+id/divider_2_post_text_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<EditText
android:id="@+id/post_title_edit_text_post_text_activity"
@@ -184,11 +177,6 @@
android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" />
- <View
- android:id="@+id/divider_4_post_text_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<EditText
android:id="@+id/post_text_content_edit_text_post_text_activity"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 31632565..f9b34698 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -73,10 +73,10 @@
</RelativeLayout>
- <View
+ <com.google.android.material.divider.MaterialDivider
android:id="@+id/divider_1_post_video_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
@@ -127,17 +127,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_2_post_video_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<LinearLayout
android:id="@+id/receive_post_reply_notifications_linear_layout_post_video_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:clickable="true"
@@ -164,10 +157,10 @@
</LinearLayout>
- <View
- android:id="@+id/divider_3_post_video_activity"
+ <com.google.android.material.divider.MaterialDivider
+ android:id="@+id/divider_2_post_video_activity"
android:layout_width="match_parent"
- android:layout_height="1dp" />
+ android:layout_height="wrap_content" />
<EditText
android:id="@+id/post_title_edit_text_post_video_activity"
@@ -182,11 +175,6 @@
android:textSize="?attr/title_font_18"
android:fontFamily="?attr/title_font_family" />
- <View
- android:id="@+id/divider_4_post_video_activity"
- android:layout_width="match_parent"
- android:layout_height="1dp" />
-
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/select_video_constraint_layout_post_video_activity"
android:layout_width="match_parent"
@@ -197,25 +185,27 @@
android:id="@+id/capture_fab_post_video_activity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:padding="16dp"
android:src="@drawable/ic_outline_add_a_photo_24dp"
+ app:useCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:tint="@android:color/white" />
+ app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/select_from_library_fab_post_video_activity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:padding="16dp"
android:src="@drawable/ic_outline_select_photo_24dp"
+ app:useCompatPadding="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity"
- app:layout_constraintTop_toTopOf="parent"
- app:tint="@android:color/white" />
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/edit_profile_activity.xml b/app/src/main/res/menu/edit_profile_activity.xml
index fe96ba20..4d5ec31d 100644
--- a/app/src/main/res/menu/edit_profile_activity.xml
+++ b/app/src/main/res/menu/edit_profile_activity.xml
@@ -6,6 +6,6 @@
android:id="@+id/action_save_edit_profile_activity"
android:orderInCategory="1"
android:title="@string/action_save"
- android:icon="@drawable/ic_save_to_database_24dp"
+ android:icon="@drawable/ic_check_circle_toolbar_24dp"
app:showAsAction="ifRoom" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b8753e8..9d2f509e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
<string name="post_gallery_activity_label">Gallery Post</string>
<string name="trending_activity_label">Trending</string>
<string name="wiki_activity_label">Wiki</string>
+ <string name="edit_profile_activity_label">Edit Profile</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
@@ -1226,9 +1227,9 @@
<string name="remove_banner">Remove Banner</string>
<string name="display_name_text">Display Name</string>
<string name="display_name_hint">Show on your profile page</string>
- <string name="display_name_description">This will be displayed to viewer of your profile page and does not change your username</string>
+ <string name="display_name_description">This will be displayed to viewers of your profile page and does not change your username.</string>
<string name="about_you_text">About You</string>
- <string name="about_you_hint">A little description of your self</string>
+ <string name="about_you_hint">A little description of yourself</string>
<string name="message_remove_avatar_success">Success remove Avatar</string>
<string name="message_remove_avatar_failed_fmt">Failed remove Avatar %s</string>
<string name="message_remove_banner_success">Success remove Banner</string>
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme