diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-07-08 10:20:40 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-07-08 10:20:40 +0200 |
commit | 4467853b7107cbd8f305ef46d1024a0a65f7a6ed (patch) | |
tree | 58d821401e77ec50d888ae539791f613e7fe7981 /app/src/main/res | |
parent | 17ed03af91f0bbfdf4bd6425252ba2cc0b417c39 (diff) |
Fix issue #222 - Profiles truncated when long bio + missing fields
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_profile.xml | 509 | ||||
-rw-r--r-- | app/src/main/res/layout/drawer_field.xml | 37 |
2 files changed, 206 insertions, 340 deletions
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index d1ff16c45..54f6c192d 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -42,9 +42,9 @@ <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" + android:id="@+id/profile_container" android:layout_height="wrap_content" - android:paddingTop="?attr/actionBarSize" - app:layout_collapseMode="parallax"> + android:paddingTop="?attr/actionBarSize"> <com.google.android.material.card.MaterialCardView android:id="@+id/banner_container" @@ -157,351 +157,186 @@ app:layout_constraintTop_toBottomOf="@id/account_dn" tools:text="\@username\@instance.test" /> - <LinearLayout - android:id="@+id/main_header_container" - android:layout_width="match_parent" + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/names_container" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center" + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" android:orientation="vertical" - android:paddingBottom="?actionBarSize" - android:paddingTop="8dp" - app:layout_collapseMode="parallax" - app:layout_constraintTop_toBottomOf="@id/account_un"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/account_un"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="5dp"> - - <LinearLayout - android:id="@+id/names_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:gravity="center_horizontal" - android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:background="@drawable/red_border" - android:text="Peertube" - android:textColor="@color/red_1" - android:visibility="gone" - tools:ignore="HardcodedText" /> - - <TextView - android:id="@+id/account_bot" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:background="@drawable/blue_border" - android:text="@string/bot" - android:textColor="@color/mastodonC4" - android:visibility="gone" /> - - <TextView - android:id="@+id/temp_mute" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:textColor="@color/red" - android:visibility="gone" /> - - <TextView - android:id="@+id/account_moved" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="5dp" - android:drawablePadding="4dp" - android:gravity="center" - android:textSize="16sp" - android:visibility="gone" /> - - </LinearLayout> - - <ImageView - android:id="@+id/identity_proofs_indicator" - android:layout_width="45dp" - android:layout_height="45dp" - android:layout_marginStart="10dp" - android:contentDescription="@string/identity_proofs" - android:padding="8dp" - android:scaleType="fitCenter" - android:src="@drawable/ic_baseline_verified_24" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="@id/names_container" - app:layout_constraintStart_toEndOf="@id/names_container" - app:layout_constraintTop_toTopOf="@id/names_container" /> - - </androidx.constraintlayout.widget.ConstraintLayout> - - <TextView - android:id="@+id/account_note" - android:layout_width="match_parent" + android:layout_marginTop="5dp" + android:background="@drawable/red_border" + android:text="Peertube" + android:textColor="@color/red_1" + android:visibility="gone" + tools:ignore="HardcodedText" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_bot" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" + android:background="@drawable/blue_border" + android:text="@string/bot" + android:textColor="@color/mastodonC4" + android:visibility="gone" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/temp_mute" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center" - android:padding="10dp" - android:textIsSelectable="true" /> + android:textColor="@color/red" + android:visibility="gone" /> - <TextView - android:id="@+id/personal_note" + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_moved" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center" android:layout_marginTop="5dp" - android:drawablePadding="5dp" + android:drawablePadding="4dp" android:gravity="center" - android:padding="10dp" - android:text="@string/action_add_notes" - android:textIsSelectable="true" - app:drawableStartCompat="@drawable/ic_baseline_note_24" /> + android:textSize="16sp" + android:visibility="gone" /> - <HorizontalScrollView - android:layout_width="match_parent" + </androidx.appcompat.widget.LinearLayoutCompat> + + <ImageView + android:id="@+id/identity_proofs_indicator" + android:layout_width="45dp" + android:layout_height="45dp" + android:layout_marginStart="10dp" + android:contentDescription="@string/identity_proofs" + android:padding="8dp" + android:scaleType="fitCenter" + android:src="@drawable/ic_baseline_verified_24" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/names_container" + app:layout_constraintStart_toEndOf="@id/names_container" + app:layout_constraintTop_toTopOf="@id/names_container" /> + + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_note" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:gravity="center" + android:padding="10dp" + android:textIsSelectable="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/names_container" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/personal_note" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:drawablePadding="5dp" + android:gravity="center" + android:padding="10dp" + android:text="@string/action_add_notes" + android:textIsSelectable="true" + app:drawableStartCompat="@drawable/ic_baseline_note_24" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/account_note" /> + + <HorizontalScrollView + android:id="@+id/info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="10dp" + android:fillViewport="true" + android:scrollbars="none" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/personal_note"> + + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" - android:fillViewport="true" - android:scrollbars="none"> + android:gravity="center_horizontal" + android:orientation="horizontal"> - <LinearLayout + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/instance_info" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:orientation="horizontal"> - - <TextView - android:id="@+id/instance_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="3dp" - android:layout_marginEnd="3dp" - android:background="@drawable/blue_border" - android:singleLine="true" - android:textColor="@color/mastodonC4" - android:visibility="gone" /> - - <TextView - android:id="@+id/account_date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="3dp" - android:layout_marginEnd="3dp" - android:background="@drawable/blue_border" - android:singleLine="true" - android:textColor="@color/mastodonC4" - android:visibility="gone" /> - - <TextView - android:id="@+id/account_followed_by" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="3dp" - android:layout_marginEnd="3dp" - android:background="@drawable/green_border" - android:singleLine="true" - android:text="@string/followed_by" - android:textColor="@color/verified_text" - android:visibility="gone" /> - - <TextView - android:id="@+id/account_follow_request" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="3dp" - android:layout_marginEnd="3dp" - android:background="@drawable/blue_border" - android:singleLine="true" - android:text="@string/request_sent" - android:textColor="@color/mastodonC4" - android:visibility="gone" /> - - </LinearLayout> - - </HorizontalScrollView> - <!-- Fields container --> - <LinearLayout - android:id="@+id/fields_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - <!-- Fields 1 to 4 --> - <LinearLayout - android:id="@+id/field1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone"> - - <TextView - android:id="@+id/label1" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:gravity="center" - android:minHeight="20dp" - android:padding="5dp" - android:paddingTop="10dp" - android:paddingBottom="10dp" /> - - <LinearLayout - android:id="@+id/value1BG" - android:layout_width="0dp" - - android:layout_height="match_parent" - android:layout_weight="2" - android:orientation="vertical"> - - <TextView - android:id="@+id/value1" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:paddingTop="10dp" - android:paddingBottom="10dp" - android:textIsSelectable="true" /> - - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/field2" - android:layout_width="match_parent" + android:layout_marginStart="3dp" + android:layout_marginEnd="3dp" + android:background="@drawable/blue_border" + android:singleLine="true" + android:textColor="@color/mastodonC4" + android:visibility="gone" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_date" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone"> - - <TextView - android:id="@+id/label2" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:gravity="center" - android:minHeight="20dp" - android:padding="10dp" - android:paddingTop="5dp" - android:paddingBottom="5dp" /> - - <LinearLayout - android:id="@+id/value2BG" - android:layout_width="0dp" - - android:layout_height="match_parent" - android:layout_weight="2" - android:orientation="vertical"> - - <TextView - android:id="@+id/value2" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:paddingTop="10dp" - android:paddingBottom="10dp" - android:textIsSelectable="true" /> - - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/field3" - android:layout_width="match_parent" + android:layout_marginStart="3dp" + android:layout_marginEnd="3dp" + android:background="@drawable/blue_border" + android:singleLine="true" + android:textColor="@color/mastodonC4" + android:visibility="gone" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_followed_by" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone"> - - <TextView - android:id="@+id/label3" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:gravity="center" - android:minHeight="20dp" - android:padding="10dp" - android:paddingTop="5dp" - android:paddingBottom="5dp" /> - - <LinearLayout - android:id="@+id/value3BG" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="2" - android:orientation="vertical"> - - <TextView - android:id="@+id/value3" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:paddingTop="10dp" - android:paddingBottom="10dp" - android:textIsSelectable="true" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/field4" - android:layout_width="match_parent" + android:layout_marginStart="3dp" + android:layout_marginEnd="3dp" + android:background="@drawable/green_border" + android:singleLine="true" + android:text="@string/followed_by" + android:textColor="@color/verified_text" + android:visibility="gone" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/account_follow_request" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone"> - - <TextView - android:id="@+id/label4" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:gravity="center" - android:minHeight="20dp" - android:padding="10dp" - android:paddingTop="5dp" - android:paddingBottom="5dp" /> - - <LinearLayout - android:id="@+id/value4BG" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="2" - android:orientation="vertical"> - - <TextView - android:id="@+id/value4" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:paddingTop="10dp" - android:paddingBottom="10dp" - android:textIsSelectable="true" /> - </LinearLayout> - - </LinearLayout> - </LinearLayout> - <!-- End Fields container --> - <TextView - android:id="@+id/warning_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/disclaimer_full" - android:textColor="@color/dark_text" - android:visibility="gone" /> - </LinearLayout> + android:layout_marginStart="3dp" + android:layout_marginEnd="3dp" + android:background="@drawable/blue_border" + android:singleLine="true" + android:text="@string/request_sent" + android:textColor="@color/mastodonC4" + android:visibility="gone" /> + </androidx.appcompat.widget.LinearLayoutCompat> + + </HorizontalScrollView> + <!-- Fields container --> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/fields_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/info" /> + <!-- End Fields container --> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/warning_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/disclaimer_full" + android:textColor="@color/dark_text" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/fields_container" /> </androidx.constraintlayout.widget.ConstraintLayout> @@ -510,6 +345,7 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:backgroundTint="?colorPrimaryDark" + app:layout_scrollFlags="scroll|enterAlways" app:layout_collapseMode="pin"> <androidx.appcompat.widget.AppCompatImageView @@ -532,14 +368,6 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> - </com.google.android.material.appbar.AppBarLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_behavior="@string/appbar_scrolling_view_behavior"> - <com.google.android.material.tabs.TabLayout android:id="@+id/account_tabLayout" android:layout_width="match_parent" @@ -547,11 +375,12 @@ android:background="?backgroundColorLight" app:tabGravity="fill" app:tabMode="fixed" /> + </com.google.android.material.appbar.AppBarLayout> - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/account_viewpager" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </LinearLayout> + <androidx.viewpager2.widget.ViewPager2 + android:id="@+id/account_viewpager" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_field.xml b/app/src/main/res/layout/drawer_field.xml new file mode 100644 index 000000000..ddfa1bbc7 --- /dev/null +++ b/app/src/main/res/layout/drawer_field.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/field1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/label" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_gravity="center" + android:layout_weight="1" + android:gravity="center" + android:minHeight="20dp" + android:padding="5dp" + android:paddingTop="10dp" + android:paddingBottom="10dp" /> + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/valueBG" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:orientation="vertical"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/value" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:paddingTop="10dp" + android:paddingBottom="10dp" + android:textIsSelectable="true" /> + </androidx.appcompat.widget.LinearLayoutCompat> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file |