Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

formatted code

This commit is contained in:
Mariotaku Lee 2017-08-22 17:10:09 +08:00
parent 7c19db15d3
commit 630925574e
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
76 changed files with 226 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
twidere/src/main/AndroidManifest.xml
View File

@ -17,9 +17,9 @@
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="org.mariotaku.twidere"
xmlns:android="http://schemas.android.com/apk/res/android"
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.mariotaku.twidere"
android:installLocation="internalOnly">
<uses-sdk tools:overrideLibrary="android.support.customtabs,net.ypresto.androidtranscoder"/>
@ -108,6 +108,7 @@
<application
android:name=".app.TwidereApplication"
android:allowBackup="true"
android:appCategory="social"
android:backupAgent=".backup.TwidereBackupAgentHelper"
android:description="@string/app_description"
android:fullBackupContent="true"

8
twidere/src/main/res/color/tertiary_text_mtrl_dark.xml
View File

@ -19,10 +19,10 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="#808080"/>
<item android:state_window_focused="false" android:color="#808080"/>
<item android:state_pressed="true" android:color="#808080"/>
<item android:state_selected="true" android:color="#323232"/>
<item android:color="#808080" android:state_enabled="false"/>
<item android:color="#808080" android:state_window_focused="false"/>
<item android:color="#808080" android:state_pressed="true"/>
<item android:color="#323232" android:state_selected="true"/>
<item android:color="#808080"/>
<!-- not selected -->
</selector>

8
twidere/src/main/res/color/tertiary_text_mtrl_light.xml
View File

@ -19,10 +19,10 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="#b0b0b0"/>
<item android:state_window_focused="false" android:color="#808080"/>
<item android:state_pressed="true" android:color="#808080"/>
<item android:state_selected="true" android:color="#808080"/>
<item android:color="#b0b0b0" android:state_enabled="false"/>
<item android:color="#808080" android:state_window_focused="false"/>
<item android:color="#808080" android:state_pressed="true"/>
<item android:color="#808080" android:state_selected="true"/>
<item android:color="#969696"/> <!-- not selected -->
</selector>

4
twidere/src/main/res/drawable/bg_shadow_video_player.xml
View File

@ -22,8 +22,8 @@
<gradient
android:angle="270"
android:centerColor="#30000000"
android:endColor="#80000000"
android:centerX="0.7"
android:startColor="#00000000" />
android:endColor="#80000000"
android:startColor="#00000000"/>
</shape>

4
twidere/src/main/res/drawable/drawer_shadow_start.xml
View File

@ -18,10 +18,10 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="8dp" />
<size android:width="8dp"/>
<gradient
android:centerColor="#11000000"
android:endColor="#00000000"
android:startColor="#33000000" />
android:startColor="#33000000"/>
</shape>

4
twidere/src/main/res/layout/action_item_home_actions.xml
View File

@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?selectableItemBackground"
android:duplicateParentState="true" />
android:duplicateParentState="true"/>
<ImageView
android:id="@android:id/icon"
@ -32,6 +32,6 @@
android:layout_gravity="center"
android:layout_margin="@dimen/element_spacing_normal"
android:contentDescription="@string/action_compose"
android:scaleType="centerInside" />
android:scaleType="centerInside"/>
</merge>

5
twidere/src/main/res/layout/activity_compose.xml
View File

@ -134,7 +134,7 @@
android:indeterminate="true"
android:padding="0dp"
android:visibility="gone"
tools:visibility="visible" />
tools:visibility="visible"/>
<RelativeLayout
android:id="@+id/composeBottomBar"
@ -152,6 +152,7 @@
android:layout_toEndOf="@+id/accountSelectorButton"
android:layout_toRightOf="@id/accountSelectorButton"
android:clickable="true"
android:focusable="true"
android:overScrollMode="never"
android:visibility="gone"
tools:listitem="@layout/adapter_item_compose_account"/>
@ -165,6 +166,7 @@
android:layout_toEndOf="@+id/accountSelectorButton"
android:layout_toRightOf="@id/accountSelectorButton"
android:clickable="true"
android:focusable="true"
android:visibility="visible">
<HorizontalScrollView
@ -235,6 +237,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:clickable="true"
android:focusable="true"
android:paddingBottom="@dimen/element_spacing_msmall"
android:paddingEnd="@dimen/element_spacing_msmall"
android:paddingLeft="@dimen/element_spacing_msmall"

2
twidere/src/main/res/layout/activity_content_fragment.xml
View File

@ -18,8 +18,8 @@
-->
<org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/main_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent">

3
twidere/src/main/res/layout/activity_home_content.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ExtendedRelativeLayout
android:id="@+id/homeContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/homeContent"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -85,6 +85,7 @@
android:layout_alignParentRight="true"
android:layout_margin="@dimen/element_spacing_large"
android:clickable="true"
android:focusable="true"
android:src="@drawable/ic_action_status_compose"
app:backgroundTint="?colorToolbar"
app:elevation="6dp"

2
twidere/src/main/res/layout/activity_media_viewer.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.TintedStatusFrameLayout
android:id="@+id/activityLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activityLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"

2
twidere/src/main/res/layout/activity_quick_search_bar.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ExtendedRelativeLayout
android:id="@+id/mainContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/element_spacing_normal">

3
twidere/src/main/res/layout/adapter_item_media_status.xml
View File

@ -18,14 +18,13 @@
-->
<android.support.v7.widget.CardView
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/element_spacing_small"
android:clickable="true"
android:foreground="?selectableItemBackground"
app:cardBackgroundColor="?cardItemBackgroundColor"
app:cardCornerRadius="2dp"

10
twidere/src/main/res/layout/adapter_item_status_count_label.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/countItem"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/countItem"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
@ -20,18 +20,18 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/element_spacing_small"
android:layout_marginRight="@dimen/element_spacing_small"
android:maxLines="1"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorPrimary"
android:textStyle="bold"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorSecondary"
tools:text="Count"
android:maxLines="1"/>
tools:text="Count"/>
</LinearLayout>

10
twidere/src/main/res/layout/adapter_item_status_error.xml
View File

@ -18,15 +18,15 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/element_spacing_normal">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" />
android:gravity="center"/>
</LinearLayout>

2
twidere/src/main/res/layout/card_item_gap.xml
View File

@ -19,9 +19,9 @@
-->
<FrameLayout
android:id="@+id/gapIndicator"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/gapIndicator"
android:layout_width="match_parent"
android:layout_height="@dimen/element_size_normal"
android:focusable="true">

14
twidere/src/main/res/layout/card_item_group_compact.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
@ -40,9 +40,9 @@
android:layout_marginEnd="@dimen/element_spacing_normal"
android:layout_marginRight="@dimen/element_spacing_normal"
android:contentDescription="@string/profile_image"
android:contextClickable="true"
android:scaleType="fitCenter"
tools:src="@drawable/ic_profile_image_twidere"
android:contextClickable="true"/>
tools:src="@drawable/ic_profile_image_twidere"/>
<org.mariotaku.twidere.view.NameView
@ -104,9 +104,9 @@
android:drawableLeft="@drawable/ic_indicator_followers"
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_indicator_followers"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/adminsCount"
@ -116,9 +116,9 @@
android:drawableLeft="@drawable/ic_indicator_followers"
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_indicator_followers"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="255"
android:maxLines="1"/>
tools:text="255"/>
</LinearLayout>
</org.mariotaku.twidere.view.ColorLabelRelativeLayout>

2
twidere/src/main/res/layout/dialog_date_time_picker.xml
View File

@ -19,9 +19,9 @@
-->
<ViewAnimator
android:id="@+id/viewAnimator"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/viewAnimator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inAnimation="@android:anim/fade_in"

2
twidere/src/main/res/layout/dialog_keyboard_shortcut_input.xml
View File

@ -19,8 +19,8 @@
-->
<org.mariotaku.twidere.view.ExtendedLinearLayout
android:id="@+id/keyboard_shortcut_input"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/keyboard_shortcut_input"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"

6
twidere/src/main/res/layout/dialog_scrollable_status.xml
View File

@ -19,14 +19,14 @@
-->
<ScrollView
android:id="@+id/status_container"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/element_spacing_normal"
android:paddingBottom="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_large"
android:paddingRight="@dimen/element_spacing_large">
android:paddingRight="@dimen/element_spacing_large"
android:paddingTop="@dimen/element_spacing_normal">
<include layout="@layout/list_item_status"/>

8
twidere/src/main/res/layout/dialog_set_consumer_key_secret.xml
View File

@ -42,11 +42,11 @@
android:ems="10"
android:hint="@string/consumer_key"
android:inputType="text|textVisiblePassword"
android:maxLines="1"
app:met_autoValidate="true"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/consumer_key"
android:maxLines="1"/>
app:met_floatingLabelText="@string/consumer_key"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/editConsumerSecret"
@ -55,11 +55,11 @@
android:ems="10"
android:hint="@string/consumer_secret"
android:inputType="text|textVisiblePassword"
android:maxLines="1"
app:met_autoValidate="true"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/consumer_secret"
android:maxLines="1"/>
app:met_floatingLabelText="@string/consumer_secret"/>
</LinearLayout>
</ScrollView>

14
twidere/src/main/res/layout/dialog_theme_background_preference.xml
View File

@ -18,16 +18,16 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:id="@+id/list_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
android:layout_weight="1"/>
<LinearLayout
android:id="@+id/alpha_container"
@ -48,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
tools:ignore="NestedWeights" />
tools:ignore="NestedWeights"/>
<ImageView
android:id="@+id/alpha_preview"
@ -60,7 +60,7 @@
android:scaleType="centerInside"
android:src="@mipmap/ic_launcher"
android:visibility="gone"
tools:ignore="ContentDescription" />
tools:ignore="ContentDescription"/>
</LinearLayout>

2
twidere/src/main/res/layout/fragment_accounts_dashboard.xml
View File

@ -18,10 +18,10 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.design.widget.NavigationView
android:id="@+id/navigationView"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/navigationView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"

2
twidere/src/main/res/layout/fragment_scrollable_status.xml
View File

@ -19,8 +19,8 @@
-->
<ScrollView
android:id="@+id/status_container"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">

6
twidere/src/main/res/layout/fragment_stub.xml
View File

@ -18,12 +18,12 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
android:layout_gravity="center"/>
</FrameLayout>

2
twidere/src/main/res/layout/fragment_user.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.TintedStatusFrameLayout
android:id="@+id/userFragmentView"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/userFragmentView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"

2
twidere/src/main/res/layout/fragment_user_profile_editor.xml
View File

@ -18,10 +18,10 @@
-->
<FrameLayout
android:id="@+id/main_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

8
twidere/src/main/res/layout/gallery_item_image_preview.xml
View File

@ -18,8 +18,8 @@
-->
<org.mariotaku.twidere.view.SquareRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.mariotaku.twidere.view.HighlightImageView
android:id="@+id/media_preview_item"
@ -28,7 +28,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"/>
<ProgressBar
android:id="@+id/media_preview_progress"
@ -40,6 +40,6 @@
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_centerInParent="true"
android:layout_margin="16dp" />
android:layout_margin="16dp"/>
</org.mariotaku.twidere.view.SquareRelativeLayout>

4
twidere/src/main/res/layout/grid_item_media_editor.xml
View File

@ -38,7 +38,7 @@
style="?android:progressBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
android:layout_gravity="center"/>
<ImageView
android:id="@+id/videoIndicator"
@ -58,7 +58,6 @@
android:layout_marginRight="@dimen/element_spacing_minus_mlarge"
android:layout_marginTop="@dimen/element_spacing_minus_mlarge"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/remove"
app:touchHeight="@dimen/element_size_normal"
app:touchWidth="@dimen/element_size_normal">
@ -82,7 +81,6 @@
android:layout_marginEnd="@dimen/element_spacing_minus_mlarge"
android:layout_marginRight="@dimen/element_spacing_minus_mlarge"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/action_edit"
app:touchHeight="@dimen/element_size_normal"
app:touchWidth="@dimen/element_size_normal">

3
twidere/src/main/res/layout/header_drawer_account_selector.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.AccountDashboardHeaderView
android:id="@+id/accountDashboardHeader"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/accountDashboardHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
@ -191,6 +191,7 @@
android:layout_alignBottom="@+id/profileContainer"
android:layout_alignTop="@+id/profileContainer"
android:clickable="true"
android:focusable="true"
tools:visibility="gone">
<org.mariotaku.twidere.view.FixedTextView

2
twidere/src/main/res/layout/header_status.xml
View File

@ -19,8 +19,8 @@
-->
<RelativeLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cardContent"
android:layout_width="match_parent"

10
twidere/src/main/res/layout/header_user.xml
View File

@ -18,10 +18,10 @@
-->
<RelativeLayout
android:id="@+id/headerUserProfile"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/headerUserProfile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:showIn="@layout/fragment_user">
@ -175,6 +175,7 @@
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
@ -195,6 +196,7 @@
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
@ -224,6 +226,7 @@
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
@ -253,6 +256,7 @@
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
@ -290,6 +294,7 @@
android:layout_weight="1"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
@ -320,6 +325,7 @@
android:layout_weight="1"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
@ -350,6 +356,7 @@
android:layout_weight="1"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
@ -380,6 +387,7 @@
android:layout_weight="1"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">

2
twidere/src/main/res/layout/layout_account_dashboard_profile_banner.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
android:id="@+id/profileBanner"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/profileBanner"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="fill"

4
twidere/src/main/res/layout/layout_action_item_favorite.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
style="?actionButtonStyle"
xmlns:android="http://schemas.android.com/apk/res/android"
style="?actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
@ -10,8 +10,8 @@
android:focusable="true">
<ImageView
android:id="@+id/icon"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"

6
twidere/src/main/res/layout/layout_actionbar_content.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<android.support.v7.widget.TwidereToolbar
android:id="@+id/action_bar"
@ -9,6 +9,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationContentDescription="@string/abc_action_bar_up_description"
tools:ignore="PrivateResource" />
tools:ignore="PrivateResource"/>
</merge>

10
twidere/src/main/res/layout/layout_api_editor_advanced_fields.xml
View File

@ -18,10 +18,10 @@
-->
<LinearLayout
android:id="@+id/advanced_api_config"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/advanced_api_config"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@ -58,11 +58,11 @@
android:ems="10"
android:hint="@string/consumer_key"
android:inputType="text|textVisiblePassword"
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/consumer_key"
tools:text="0123456789ABCD"
android:maxLines="1"/>
tools:text="0123456789ABCD"/>
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/editConsumerSecret"
@ -71,10 +71,10 @@
android:ems="10"
android:hint="@string/consumer_secret"
android:inputType="text|textVisiblePassword"
android:maxLines="1"
app:met_baseColor="?android:textColorPrimary"
app:met_floatingLabel="normal"
app:met_floatingLabelText="@string/consumer_secret"
tools:text="0123456789ABCD"
android:maxLines="1"/>
tools:text="0123456789ABCD"/>
</LinearLayout>

2
twidere/src/main/res/layout/layout_media_viewer_exo_player_view.xml
View File

@ -19,9 +19,9 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<com.google.android.exoplayer2.ui.SimpleExoPlayerView
android:id="@+id/playerView"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/playerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"

2
twidere/src/main/res/layout/layout_media_viewer_gif.xml
View File

@ -17,7 +17,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<pl.droidsonroids.gif.GifTextureView
android:id="@+id/gifView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gifView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

1
twidere/src/main/res/layout/layout_media_viewer_texture_video_view.xml
View File

@ -21,7 +21,6 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center">

18
twidere/src/main/res/layout/layout_media_viewer_video_controller_exo.xml
View File

@ -18,22 +18,23 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout
android:id="@+id/videoControl"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/videoControl"
android:layout_width="match_parent"
android:layout_gravity="bottom"
android:layout_height="?actionBarSize"
android:layout_gravity="bottom"
android:background="@drawable/bg_viewer_actionbar"
android:clickable="true">
android:clickable="true"
android:focusable="true">
<FrameLayout
android:id="@+id/playPauseContainer"
android:layout_width="@dimen/element_size_normal"
android:layout_height="@dimen/element_size_normal"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
android:layout_alignParentStart="true"
android:layout_centerVertical="true">
<ImageButton
android:id="@id/exo_play"
@ -42,6 +43,7 @@
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/exo_controls_play_description"
android:focusable="true"
android:src="@drawable/ic_action_play_arrow"
tools:visibility="visible"/>
@ -52,6 +54,7 @@
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/exo_controls_pause_description"
android:focusable="true"
android:src="@drawable/ic_action_pause"
tools:visibility="gone"/>
</FrameLayout>
@ -61,8 +64,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/exo_progress"
android:layout_alignStart="@id/exo_progress"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/exo_progress"
android:layout_marginBottom="@dimen/element_spacing_xsmall"
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
@ -85,9 +88,9 @@
<org.mariotaku.twidere.view.FixedTextView
android:id="@id/exo_duration"
android:layout_width="wrap_content"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/exo_progress"
android:layout_alignParentBottom="true"
android:layout_alignRight="@id/exo_progress"
android:layout_marginBottom="@dimen/element_spacing_xsmall"
android:layout_marginEnd="@dimen/element_spacing_small"
@ -107,6 +110,7 @@
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:contentDescription="@string/action_mute"
android:focusable="true"
android:minWidth="@dimen/element_size_normal"
android:src="@drawable/ic_action_speaker_max"/>

2
twidere/src/main/res/layout/layout_surface_view.xml
View File

@ -19,7 +19,7 @@
-->
<SurfaceView
android:id="@+id/surfaceView"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/surfaceView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

20
twidere/src/main/res/layout/layout_tab_item.xml
View File

@ -19,12 +19,12 @@
<!--suppress AndroidUnknownAttribute -->
<view xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
class="org.mariotaku.twidere.view.TabPagerIndicator$ItemLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectableItemBackground"
tools:layout_height="?actionBarSize">
xmlns:tools="http://schemas.android.com/tools"
class="org.mariotaku.twidere.view.TabPagerIndicator$ItemLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectableItemBackground"
tools:layout_height="?actionBarSize">
<LinearLayout
android:id="@+id/tab_content"
@ -40,7 +40,7 @@
android:layout_height="@dimen/action_icon_size"
android:contentDescription="@string/icon"
android:scaleType="centerInside"
tools:src="@drawable/ic_action_home" />
tools:src="@drawable/ic_action_home"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/tab_label"
@ -50,7 +50,7 @@
android:textAllCaps="true"
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorPrimary"
android:textStyle="bold" />
android:textStyle="bold"/>
</LinearLayout>
<org.mariotaku.twidere.view.BadgeView
@ -65,7 +65,7 @@
android:ellipsize="none"
android:gravity="center"
android:padding="@dimen/element_spacing_xsmall"
android:textColor="@android:color/white"
android:maxLines="1"/>
android:singleLine="true"
android:textColor="@android:color/white"/>
</view>

3
twidere/src/main/res/layout/layout_toolbar_message_conversation_title.xml
View File

@ -19,14 +19,13 @@
-->
<LinearLayout
android:id="@+id/conversationTitleContainer"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/conversationTitleContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:orientation="horizontal"
tools:layout_height="?actionBarSize">

2
twidere/src/main/res/layout/layout_twitter_card_poll.xml
View File

@ -19,8 +19,8 @@
-->
<LinearLayout
android:id="@+id/fragmentCardPoll"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragmentCardPoll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

2
twidere/src/main/res/layout/layout_user_profile_birthday_stub.xml
View File

@ -19,8 +19,8 @@
-->
<FrameLayout
android:id="@+id/profileBirthdayBanner"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/profileBirthdayBanner"
android:layout_width="match_parent"
android:layout_height="wrap_content">

26
twidere/src/main/res/layout/list_action_item.xml
View File

@ -15,30 +15,30 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@android:id/icon"
android:layout_toRightOf="@android:id/icon"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:padding="8dp">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@android:id/icon"
android:layout_toRightOf="@android:id/icon"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:padding="8dp">
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:maxLines="1"/>
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:textAppearance="?android:attr/textAppearanceMedium"
android:maxLines="1"/>
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</LinearLayout>

2
twidere/src/main/res/layout/list_item_activity_summary_compact.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"

12
twidere/src/main/res/layout/list_item_compose_account.xml
View File

@ -18,16 +18,16 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<org.mariotaku.twidere.view.ProfileImageView
android:id="@android:id/icon"
style="?profileImageStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
android:layout_height="match_parent"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text1"
@ -38,6 +38,6 @@
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorPrimary"
android:textStyle="bold"
tool:text="Name" />
tool:text="Name"/>
</LinearLayout>

4
twidere/src/main/res/layout/list_item_dashboard_menu.xml
View File

@ -44,9 +44,9 @@
android:layout_marginStart="8dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:maxLines="1"/>
android:textSize="16sp"/>
</LinearLayout>

2
twidere/src/main/res/layout/list_item_draft.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ColorLabelLinearLayout
android:id="@+id/content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:activatedBackgroundIndicator"

20
twidere/src/main/res/layout/list_item_menu.xml
View File

@ -18,12 +18,12 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeightSmall"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeightSmall"
android:orientation="horizontal">
<ImageView
android:id="@android:id/icon"
@ -33,7 +33,7 @@
android:layout_marginStart="12dp"
android:layout_weight="0"
android:contentDescription="@string/icon"
android:scaleType="centerInside" />
android:scaleType="centerInside"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text1"
@ -43,9 +43,9 @@
android:layout_marginStart="8dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
android:maxLines="1"/>
android:textColor="?android:textColorPrimary"/>
<CheckBox
android:id="@android:id/checkbox"
@ -58,6 +58,6 @@
android:layout_weight="0"
android:clickable="false"
android:focusable="false"
android:visibility="gone" />
android:visibility="gone"/>
</LinearLayout>

2
twidere/src/main/res/layout/list_item_message_entry.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"

2
twidere/src/main/res/layout/list_item_preference_header_category.xml
View File

@ -21,9 +21,9 @@
<!-- Layout of a header item in PreferenceActivity. -->
<org.mariotaku.twidere.view.FixedTextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/title"
style="?android:listSeparatorTextViewStyle"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"

11
twidere/src/main/res/layout/list_item_scheduled_status.xml
View File

@ -19,10 +19,11 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>

4
twidere/src/main/res/layout/list_item_section_header.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<org.mariotaku.twidere.view.FixedTextView
android:id="@+id/sectionHeader"
style="?android:listSeparatorTextViewStyle"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/sectionHeader"
style="?android:listSeparatorTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?colorAccent"

2
twidere/src/main/res/layout/list_item_separator.xml
View File

@ -19,8 +19,8 @@
-->
<org.mariotaku.twidere.view.FixedTextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?android:listSeparatorTextViewStyle"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

2
twidere/src/main/res/layout/list_item_simple_user.xml
View File

@ -18,9 +18,9 @@
-->
<LinearLayout
android:id="@+id/listItem"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/listItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"

2
twidere/src/main/res/layout/list_item_simple_user_list.xml
View File

@ -18,9 +18,9 @@
-->
<LinearLayout
android:id="@+id/listItem"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/listItem"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"

6
twidere/src/main/res/layout/list_item_status.xml
View File

@ -17,10 +17,10 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
@ -215,6 +215,7 @@
android:layout_marginTop="@dimen/element_spacing_small"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:paddingBottom="@dimen/element_spacing_small"
android:paddingEnd="@dimen/element_spacing_small"
android:paddingLeft="@dimen/element_spacing_normal"
@ -334,7 +335,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="false">
<org.mariotaku.twidere.view.IconActionView
@ -373,7 +373,6 @@
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="false">
<org.mariotaku.twidere.view.IconActionView
@ -413,7 +412,6 @@
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="false">
<org.mariotaku.twidere.view.IconActionView

4
twidere/src/main/res/layout/list_item_suggestion_search.xml
View File

@ -60,10 +60,10 @@
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
tools:text="Mariotaku"
android:maxLines="1"/>
tools:text="Mariotaku"/>
</LinearLayout>

8
twidere/src/main/res/layout/list_item_suggestion_user.xml
View File

@ -54,10 +54,10 @@
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
tools:text="Mariotaku"
android:maxLines="1"/>
tools:text="Mariotaku"/>
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text2"
@ -65,10 +65,10 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/element_spacing_small"
android:layout_marginStart="@dimen/element_spacing_small"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
tools:text="\@mariotaku"
android:maxLines="1"/>
tools:text="\@mariotaku"/>
</LinearLayout>
</LinearLayout>

2
twidere/src/main/res/layout/list_item_user.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"

2
twidere/src/main/res/layout/list_item_user_list.xml
View File

@ -18,10 +18,10 @@
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/itemContent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"

2
twidere/src/main/res/layout/preference_widget_color_picker.xml
View File

@ -26,4 +26,4 @@
android:layout_gravity="center"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
app:sivShape="circle" />
app:sivShape="circle"/>

2
twidere/src/main/res/layout/simple_list_item_activated_1.xml
View File

@ -15,9 +15,9 @@
-->
<org.mariotaku.twidere.view.FixedTextView
android:id="@android:id/text1"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:activatedBackgroundIndicator"

2
twidere/src/main/res/layout/switch_item.xml
View File

@ -26,5 +26,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
android:layout_centerVertical="true"/>
</RelativeLayout>

20
twidere/src/main/res/menu/action_multi_select_contents.xml
View File

@ -6,18 +6,18 @@
android:id="@id/select_account"
android:actionProviderClass="org.mariotaku.twidere.menu.AccountActionProvider"
android:icon="@drawable/ic_action_user"
app:showAsAction="always"
android:title="@string/select_account"/>
android:title="@string/select_account"
app:showAsAction="always"/>
<item
android:id="@id/reply"
android:icon="@drawable/ic_action_reply"
app:showAsAction="always"
android:title="@string/action_reply"/>
android:title="@string/action_reply"
app:showAsAction="always"/>
<item
android:id="@+id/mute_submenu"
android:icon="@drawable/ic_action_speaker_muted"
app:showAsAction="ifRoom"
android:title="@string/action_add_to_filter">
android:title="@string/action_add_to_filter"
app:showAsAction="ifRoom">
<menu>
<item
android:id="@id/mute_user"
@ -31,8 +31,8 @@
<item
android:id="@+id/block_submenu"
android:icon="@drawable/ic_action_block"
app:showAsAction="ifRoom"
android:title="@string/action_block">
android:title="@string/action_block"
app:showAsAction="ifRoom">
<menu>
<item
android:id="@id/block"
@ -46,8 +46,8 @@
<item
android:id="@+id/report_spam_submenu"
android:icon="@drawable/ic_action_warning"
app:showAsAction="ifRoom"
android:title="@string/report_for_spam">
android:title="@string/report_for_spam"
app:showAsAction="ifRoom">
<menu>
<item
android:id="@id/report_spam"

4
twidere/src/main/res/menu/menu_accounts_manager.xml
View File

@ -23,6 +23,6 @@
<item
android:id="@id/add_account"
android:icon="@drawable/ic_action_add"
app:showAsAction="ifRoom"
android:title="@string/add_account"/>
android:title="@string/add_account"
app:showAsAction="ifRoom"/>
</menu>

4
twidere/src/main/res/menu/menu_filters.xml
View File

@ -5,7 +5,7 @@
<item
android:id="@id/add"
android:icon="@drawable/ic_action_add"
app:showAsAction="always"
android:title="@string/action_add_filter_rule"/>
android:title="@string/action_add_filter_rule"
app:showAsAction="always"/>
</menu>

4
twidere/src/main/res/menu/menu_host_mapping.xml
View File

@ -5,7 +5,7 @@
<item
android:id="@+id/add"
android:icon="@drawable/ic_action_add"
app:showAsAction="always"
android:title="@string/add_host_mapping"/>
android:title="@string/add_host_mapping"
app:showAsAction="always"/>
</menu>

10
twidere/src/main/res/menu/menu_media_viewer.xml
View File

@ -18,23 +18,23 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@id/refresh"
android:icon="@drawable/ic_action_refresh"
android:title="@string/action_refresh"
app:showAsAction="ifRoom" />
app:showAsAction="ifRoom"/>
<item
android:id="@id/share"
android:icon="@drawable/ic_action_share"
android:title="@string/action_share"
app:showAsAction="ifRoom" />
app:showAsAction="ifRoom"/>
<item
android:id="@id/save"
android:icon="@drawable/ic_action_save"
android:title="@string/save_to_gallery" />
android:title="@string/save_to_gallery"/>
<item
android:id="@id/open_in_browser"
android:icon="@drawable/ic_action_web"
android:title="@string/action_open_in_browser" />
android:title="@string/action_open_in_browser"/>
</menu>

4
twidere/src/main/res/menu/menu_profile_editor.xml
View File

@ -22,7 +22,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@id/save"
app:showAsAction="always"
android:icon="@drawable/ic_action_confirm"
android:title="@string/action_save"
android:icon="@drawable/ic_action_confirm"/>
app:showAsAction="always"/>
</menu>

8
twidere/src/main/res/menu/menu_search.xml
View File

@ -5,12 +5,12 @@
<item
android:id="@id/compose"
android:icon="@drawable/ic_action_status_compose"
app:showAsAction="always"
android:title="@string/action_compose"/>
android:title="@string/action_compose"
app:showAsAction="always"/>
<item
android:id="@id/save"
android:icon="@drawable/ic_action_save"
app:showAsAction="ifRoom"
android:title="@string/action_save"/>
android:title="@string/action_save"
app:showAsAction="ifRoom"/>
</menu>

4
twidere/src/main/res/menu/menu_switch_preference.xml
View File

@ -4,8 +4,8 @@
<item
android:id="@id/toggle"
android:title="@string/action_toggle"
app:actionLayout="@layout/action_item_switch"
app:showAsAction="always"
android:title="@string/action_toggle"/>
app:showAsAction="always"/>
</menu>

18
twidere/src/main/res/menu/menu_user_list.xml
View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@id/info"
android:icon="@drawable/ic_action_info"
android:title="@string/user_list_details"
app:showAsAction="ifRoom"
android:visible="false" />
android:visible="false"
app:showAsAction="ifRoom"/>
<item
android:id="@id/follow"
android:enabled="false"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_add"
android:title="@string/action_subscribe" />
android:title="@string/action_subscribe"
app:showAsAction="ifRoom"/>
<item
android:id="@id/edit"
android:icon="@drawable/ic_action_edit"
android:title="@string/title_edit_details"
android:visible="false" />
android:visible="false"/>
<item
android:id="@id/add"
android:icon="@drawable/ic_action_add"
android:title="@string/action_add_member" />
android:title="@string/action_add_member"/>
<item
android:id="@id/delete"
android:icon="@drawable/ic_action_delete"
android:title="@string/action_delete" />
android:title="@string/action_delete"/>
<item
android:id="@id/open_with_account"
android:icon="@drawable/ic_action_accounts"
android:title="@string/open_with_account" />
android:title="@string/open_with_account"/>
</menu>

8
twidere/src/main/res/values/dimens_system.xml
View File

@ -3,14 +3,14 @@
<!-- The platform's desired fixed width for a dialog along the major axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_major">100%</item>
<item name="dialog_fixed_width_major" type="dimen">100%</item>
<!-- The platform's desired fixed width for a dialog along the minor axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_minor">100%</item>
<item name="dialog_fixed_width_minor" type="dimen">100%</item>
<!-- The platform's desired fixed height for a dialog along the major axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_major">80%</item>
<item name="dialog_fixed_height_major" type="dimen">80%</item>
<!-- The platform's desired fixed height for a dialog along the minor axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_minor">100%</item>
<item name="dialog_fixed_height_minor" type="dimen">100%</item>
</resources>

4
twidere/src/main/res/values/styles_base.xml
View File

@ -28,8 +28,8 @@
</style>
<style name="Widget.Base.TextView.Light" parent="android:Widget.Holo.TextView" />
<style name="Widget.Base.TextView.Light" parent="android:Widget.Holo.TextView"/>
<style name="Widget.Base.TextView.Dark" parent="android:Widget.Holo.Light.TextView" />
<style name="Widget.Base.TextView.Dark" parent="android:Widget.Holo.Light.TextView"/>
</resources>