diff options
Diffstat (limited to 'app/src/main/res')
73 files changed, 453 insertions, 23410 deletions
diff --git a/app/src/main/res/layout/activity_admin_report.xml b/app/src/main/res/layout/activity_admin_report.xml index c29f3e869..401da93af 100644 --- a/app/src/main/res/layout/activity_admin_report.xml +++ b/app/src/main/res/layout/activity_admin_report.xml @@ -344,9 +344,9 @@ android:id="@+id/comment" android:layout_width="match_parent" android:layout_height="wrap_content" + android:importantForAutofill="no" android:minLines="3" - app:layout_constraintTop_toBottomOf="@id/comment_label" - android:importantForAutofill="no" /> + app:layout_constraintTop_toBottomOf="@id/comment_label" /> <TextView android:id="@+id/lv_statuses_label" diff --git a/app/src/main/res/layout/activity_custom_sharing.xml b/app/src/main/res/layout/activity_custom_sharing.xml index b3a075d39..4de374936 100644 --- a/app/src/main/res/layout/activity_custom_sharing.xml +++ b/app/src/main/res/layout/activity_custom_sharing.xml @@ -54,10 +54,10 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:hint="@string/title_hint_custom_sharing" + android:importantForAutofill="no" android:lines="2" android:maxLines="2" - android:minLines="1" - android:importantForAutofill="no" /> + android:minLines="1" /> <!-- Description --> diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 62ecd8c27..d4ed179f7 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -133,16 +133,16 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:inputType="text" - android:importantForAutofill="no" /> + android:importantForAutofill="no" + android:inputType="text" /> <EditText android:id="@+id/cf_val_1" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="2" - android:inputType="text" - android:importantForAutofill="no" /> + android:importantForAutofill="no" + android:inputType="text" /> </LinearLayout> <LinearLayout diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml index 7c0c30a7e..753072793 100644 --- a/app/src/main/res/layout/activity_group.xml +++ b/app/src/main/res/layout/activity_group.xml @@ -37,8 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - /> + app:layout_scrollFlags="scroll|enterAlways" /> </com.google.android.material.appbar.AppBarLayout> <RelativeLayout @@ -58,7 +57,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@null" - android:scrollbars="none"/> + android:scrollbars="none" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <RelativeLayout diff --git a/app/src/main/res/layout/activity_hashtag.xml b/app/src/main/res/layout/activity_hashtag.xml index a7f241fa0..a64d2252c 100644 --- a/app/src/main/res/layout/activity_hashtag.xml +++ b/app/src/main/res/layout/activity_hashtag.xml @@ -37,8 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - /> + app:layout_scrollFlags="scroll|enterAlways" /> </com.google.android.material.appbar.AppBarLayout> <RelativeLayout diff --git a/app/src/main/res/layout/activity_instance.xml b/app/src/main/res/layout/activity_instance.xml index de48e5ebe..9bcd48a14 100644 --- a/app/src/main/res/layout/activity_instance.xml +++ b/app/src/main/res/layout/activity_instance.xml @@ -86,7 +86,7 @@ android:contentDescription="@string/contact_instance_admin" android:src="@drawable/ic_mail_outline" app:backgroundTint="?colorAccent" - app:tint="?iconColorMenu"/> + app:tint="?iconColorMenu" /> </LinearLayout> <!-- Main Loader --> <RelativeLayout diff --git a/app/src/main/res/layout/activity_instance_social.xml b/app/src/main/res/layout/activity_instance_social.xml index 58e39eafb..139e2c77f 100644 --- a/app/src/main/res/layout/activity_instance_social.xml +++ b/app/src/main/res/layout/activity_instance_social.xml @@ -29,10 +29,11 @@ android:visibility="gone"> <LinearLayout + android:id="@+id/main_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:id="@+id/main_container"> + android:orientation="vertical"> + <TextView android:id="@+id/name" android:layout_width="wrap_content" @@ -85,19 +86,20 @@ android:text="via instances.social" tools:ignore="HardcodedText" /> </LinearLayout> + <TextView - android:layout_marginTop="50dp" - android:layout_marginBottom="50dp" + android:id="@+id/no_instance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" - android:textSize="16sp" - android:id="@+id/no_instance" - android:visibility="gone" - android:autoLink="web" android:layout_gravity="center" + android:layout_marginTop="50dp" + android:layout_marginBottom="50dp" + android:autoLink="web" + android:gravity="center" android:text="@string/no_instance_reccord" - /> + android:textSize="16sp" + android:visibility="gone" /> + <Button android:id="@+id/close" style="@style/Base.Widget.AppCompat.Button.Colored" diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 8e57f197f..32ea1e91e 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -39,8 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - /> + app:layout_scrollFlags="scroll|enterAlways" /> </com.google.android.material.appbar.AppBarLayout> <RelativeLayout diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index ef6faf82a..1f76ba0e3 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -91,11 +91,11 @@ android:drawableStart="@drawable/ic_check_circle" android:drawablePadding="10dp" android:gravity="center" - android:singleLine="true" android:paddingStart="15dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" + android:singleLine="true" android:text="@string/connect_instance" android:textAllCaps="false" android:textSize="20sp" @@ -180,8 +180,8 @@ android:layout_marginTop="10dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:passwordToggleEnabled="true" - app:layout_constraintTop_toBottomOf="@id/login_uid_container"> + app:layout_constraintTop_toBottomOf="@id/login_uid_container" + app:passwordToggleEnabled="true"> <com.google.android.material.textfield.TextInputEditText android:id="@+id/login_passwd" @@ -213,11 +213,11 @@ android:drawableStart="@drawable/mastodon_icon" android:drawablePadding="10dp" android:gravity="center" - android:singleLine="true" android:paddingStart="15dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" + android:singleLine="true" android:text="@string/login" android:textAllCaps="false" android:textSize="20sp" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d540a5f0a..8a1ac2115 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -38,8 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - > + app:layout_scrollFlags="scroll|enterAlways"> <ImageView android:id="@+id/iconbar" @@ -128,8 +127,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin_floating" android:contentDescription="@string/toot_it" - android:src="@drawable/ic_edit" - /> + android:src="@drawable/ic_edit" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/delete_all" @@ -139,8 +137,7 @@ android:layout_margin="@dimen/fab_margin_floating" android:contentDescription="@string/delete_all" android:src="@drawable/ic_delete_floating" - android:visibility="gone" - /> + android:visibility="gone" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/add_new" @@ -150,8 +147,7 @@ android:layout_margin="@dimen/fab_margin_floating" android:contentDescription="@string/add_new" android:src="@drawable/ic_action_add_new" - android:visibility="gone" - /> + android:visibility="gone" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> <com.google.android.material.navigation.NavigationView @@ -159,10 +155,10 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" - android:fitsSystemWindows="false" - app:itemTextColor="?attr/textColor" android:background="@color/cyanea_primary_dark_reference" + android:fitsSystemWindows="false" app:headerLayout="@layout/nav_header_main" + app:itemTextColor="?attr/textColor" app:menu="@menu/activity_main_drawer" /> </androidx.drawerlayout.widget.DrawerLayout> diff --git a/app/src/main/res/layout/activity_media_pager.xml b/app/src/main/res/layout/activity_media_pager.xml index 00688cf9e..562872152 100644 --- a/app/src/main/res/layout/activity_media_pager.xml +++ b/app/src/main/res/layout/activity_media_pager.xml @@ -17,8 +17,8 @@ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/transparent" - android:animateLayoutChanges="true"> + android:animateLayoutChanges="true" + android:background="@android:color/transparent"> <androidx.viewpager.widget.ViewPager android:id="@+id/media_viewpager" diff --git a/app/src/main/res/layout/activity_ower_notifications.xml b/app/src/main/res/layout/activity_ower_notifications.xml index 6aca79cee..24d4e6aa5 100644 --- a/app/src/main/res/layout/activity_ower_notifications.xml +++ b/app/src/main/res/layout/activity_ower_notifications.xml @@ -22,8 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - /> + app:layout_scrollFlags="scroll|enterAlways" /> </com.google.android.material.appbar.AppBarLayout> <RelativeLayout diff --git a/app/src/main/res/layout/activity_ower_status.xml b/app/src/main/res/layout/activity_ower_status.xml index 64b67e06b..0ad2f0757 100644 --- a/app/src/main/res/layout/activity_ower_status.xml +++ b/app/src/main/res/layout/activity_ower_status.xml @@ -22,8 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?colorPrimary" - app:layout_scrollFlags="scroll|enterAlways" - /> + app:layout_scrollFlags="scroll|enterAlways" /> </com.google.android.material.appbar.AppBarLayout> <RelativeLayout diff --git a/app/src/main/res/layout/activity_peertube_edit.xml b/app/src/main/res/layout/activity_peertube_edit.xml index 251d3c290..f5ff0299f 100644 --- a/app/src/main/res/layout/activity_peertube_edit.xml +++ b/app/src/main/res/layout/activity_peertube_edit.xml @@ -17,7 +17,6 @@ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:TagsEditText="http://schemas.android.com/apk/res-auto" - xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -122,8 +121,7 @@ <Spinner android:id="@+id/set_upload_channel" android:layout_width="match_parent" - android:layout_height="wrap_content" - /> + android:layout_height="wrap_content" /> </LinearLayout> @@ -145,8 +143,7 @@ <Spinner android:id="@+id/set_upload_categories" android:layout_width="match_parent" - android:layout_height="wrap_content" - /> + android:layout_height="wrap_content" /> </LinearLayout> @@ -168,8 +165,7 @@ <Spinner android:id="@+id/set_upload_licenses" android:layout_width="match_parent" - android:layout_height="wrap_content" - /> + |