Merge branch 'kasun/fedilab-working' into develop
# Conflicts: # app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java # app/src/main/res/values/strings.xml
This commit is contained in:
commit
8f6aac6d9f
|
@ -4,7 +4,7 @@
|
|||
<stroke
|
||||
android:width="1dip"
|
||||
android:color="@color/verified_text" />
|
||||
<corners android:radius="2dp"></corners>
|
||||
<corners android:radius="2dp" />
|
||||
<padding
|
||||
android:bottom="1dip"
|
||||
android:left="4dip"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<stroke
|
||||
android:width="1dip"
|
||||
android:color="@color/red_1" />
|
||||
<corners android:radius="2dp"></corners>
|
||||
<corners android:radius="2dp" />
|
||||
<padding
|
||||
android:bottom="1dip"
|
||||
android:left="4dip"
|
||||
|
|
|
@ -211,36 +211,6 @@
|
|||
android:textColor="@color/red"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_followed_by"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/green_border"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
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_gravity="center"
|
||||
android:background="@drawable/blue_border"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:text="@string/request_sent"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_moved"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -263,42 +233,79 @@
|
|||
android:gravity="center"
|
||||
android:padding="10dp" />
|
||||
|
||||
<LinearLayout
|
||||
<HorizontalScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
android:fillViewport="true"
|
||||
android:scrollbars="none">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/instance_info"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:background="@drawable/blue_border"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/seperator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:gravity="center"
|
||||
android:text="-"
|
||||
android:visibility="gone" />
|
||||
<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:maxLines="1"
|
||||
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_gravity="center"
|
||||
android:gravity="center" />
|
||||
</LinearLayout>
|
||||
<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:maxLines="1"
|
||||
android:textColor="@color/mastodonC4" />
|
||||
|
||||
<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:maxLines="1"
|
||||
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:maxLines="1"
|
||||
android:text="@string/request_sent"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/label_blocked"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:background="@drawable/red_border"
|
||||
android:maxLines="1"
|
||||
android:text="@string/blocked"
|
||||
android:textColor="@color/red_1"
|
||||
android:visibility="gone" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</HorizontalScrollView>
|
||||
<!-- Fields container -->
|
||||
<LinearLayout
|
||||
android:id="@+id/fields_container"
|
||||
|
|
|
@ -219,38 +219,6 @@
|
|||
android:textColor="@color/red"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_followed_by"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/green_border"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
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_gravity="center"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/blue_border"
|
||||
android:gravity="center"
|
||||
android:maxLines="1"
|
||||
android:text="@string/request_sent"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/account_moved"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -274,43 +242,79 @@
|
|||
android:gravity="center"
|
||||
android:padding="10dp" />
|
||||
|
||||
<LinearLayout
|
||||
<HorizontalScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
android:fillViewport="true"
|
||||
android:scrollbars="none">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/instance_info"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:background="@drawable/blue_border"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/seperator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:gravity="center"
|
||||
android:text="-"
|
||||
android:visibility="gone"
|
||||
tools:ignore="HardcodedText" />
|
||||
<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:maxLines="1"
|
||||
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_gravity="center"
|
||||
android:gravity="center" />
|
||||
</LinearLayout>
|
||||
<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:maxLines="1"
|
||||
android:textColor="@color/mastodonC4" />
|
||||
|
||||
<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:maxLines="1"
|
||||
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:maxLines="1"
|
||||
android:text="@string/request_sent"
|
||||
android:textColor="@color/mastodonC4"
|
||||
android:visibility="gone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/label_blocked"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:background="@drawable/red_border"
|
||||
android:maxLines="1"
|
||||
android:text="@string/blocked"
|
||||
android:textColor="@color/red_1"
|
||||
android:visibility="gone" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</HorizontalScrollView>
|
||||
<!-- Fields container -->
|
||||
<LinearLayout
|
||||
android:id="@+id/fields_container"
|
||||
|
|
|
@ -1151,4 +1151,5 @@
|
|||
<string name="user_count">User count</string>
|
||||
<string name="status_count">Status count</string>
|
||||
<string name="instance_count">Instance count</string>
|
||||
<string name="blocked">Blocked</string>
|
||||
</resources>
|
Loading…
Reference in New Issue