Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
tom79 2019-11-16 12:10:28 +01:00
parent cf5a254b6b a022e0a434
commit 8f6aac6d9f
5 changed files with 133 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/green_border.xml
View File

@ -4,7 +4,7 @@
<stroke <stroke
android:width="1dip" android:width="1dip"
android:color="@color/verified_text" /> android:color="@color/verified_text" />
<corners android:radius="2dp"></corners> <corners android:radius="2dp" />
<padding <padding
android:bottom="1dip" android:bottom="1dip"
android:left="4dip" android:left="4dip"

2
app/src/main/res/drawable/red_border.xml
View File

@ -4,7 +4,7 @@
<stroke <stroke
android:width="1dip" android:width="1dip"
android:color="@color/red_1" /> android:color="@color/red_1" />
<corners android:radius="2dp"></corners> <corners android:radius="2dp" />
<padding <padding
android:bottom="1dip" android:bottom="1dip"
android:left="4dip" android:left="4dip"

123
app/src/main/res/layout-sw600dp/activity_show_account.xml
View File

@ -211,36 +211,6 @@
android:textColor="@color/red" android:textColor="@color/red"
android:visibility="gone" /> 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 <TextView
android:id="@+id/account_moved" android:id="@+id/account_moved"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -263,42 +233,79 @@
android:gravity="center" android:gravity="center"
android:padding="10dp" /> android:padding="10dp" />
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:gravity="center" android:fillViewport="true"
android:orientation="horizontal"> android:scrollbars="none">
<TextView <LinearLayout
android:id="@+id/instance_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:gravity="center_horizontal"
android:layout_marginEnd="5dp" android:orientation="horizontal">
android:background="@drawable/blue_border"
android:gravity="center"
android:textColor="@color/mastodonC4"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/seperator" android:id="@+id/instance_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="3dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="3dp"
android:gravity="center" android:background="@drawable/blue_border"
android:text="-" android:maxLines="1"
android:visibility="gone" /> android:textColor="@color/mastodonC4"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/account_date" android:id="@+id/account_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="3dp"
android:gravity="center" /> android:layout_marginEnd="3dp"
</LinearLayout> 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 --> <!-- Fields container -->
<LinearLayout <LinearLayout
android:id="@+id/fields_container" android:id="@+id/fields_container"

126
app/src/main/res/layout/activity_show_account.xml
View File

@ -219,38 +219,6 @@
android:textColor="@color/red" android:textColor="@color/red"
android:visibility="gone" /> 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 <TextView
android:id="@+id/account_moved" android:id="@+id/account_moved"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -274,43 +242,79 @@
android:gravity="center" android:gravity="center"
android:padding="10dp" /> android:padding="10dp" />
<LinearLayout <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:gravity="center" android:fillViewport="true"
android:orientation="horizontal"> android:scrollbars="none">
<TextView <LinearLayout
android:id="@+id/instance_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:gravity="center_horizontal"
android:layout_marginEnd="5dp" android:orientation="horizontal">
android:background="@drawable/blue_border"
android:gravity="center"
android:textColor="@color/mastodonC4"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/seperator" android:id="@+id/instance_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="3dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="3dp"
android:gravity="center" android:background="@drawable/blue_border"
android:text="-" android:maxLines="1"
android:visibility="gone" android:textColor="@color/mastodonC4"
tools:ignore="HardcodedText" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/account_date" android:id="@+id/account_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="3dp"
android:gravity="center" /> android:layout_marginEnd="3dp"
</LinearLayout> 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 --> <!-- Fields container -->
<LinearLayout <LinearLayout
android:id="@+id/fields_container" android:id="@+id/fields_container"

1
app/src/main/res/values/strings.xml
View File

@ -1151,4 +1151,5 @@
<string name="user_count">User count</string> <string name="user_count">User count</string>
<string name="status_count">Status count</string> <string name="status_count">Status count</string>
<string name="instance_count">Instance count</string> <string name="instance_count">Instance count</string>
<string name="blocked">Blocked</string>
</resources> </resources>