owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Posts redesign wip

Browse Source
This commit is contained in:
Grishka
2023-03-14 19:17:37 +03:00
parent d6bcc9c156
commit 20799ef1a8
52 changed files with 926 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/res/drawable/bg_audio_play_button.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
<item>
<shape android:shape="oval">
<solid android:color="#80000000"/>
</shape>
</item>
<item android:id="@android:id/mask">
<shape android:shape="oval">
<solid android:color="#ff000000"/>
</shape>
</item>
</ripple>

10
mastodon/src/main/res/drawable/bg_poll_option_clickable.xml
View File

@@ -2,8 +2,14 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item>
<shape>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>

20
mastodon/src/main/res/drawable/bg_poll_option_voted.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
</shape>
<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
<shape>
<solid android:color="?colorM3SecondaryContainer"/>
<corners android:radius="20dp"/>
</shape>
</scale>
</item>
<item>
<clip android:clipOrientation="horizontal" android:gravity="start">
<shape>
<solid android:color="@color/poll_option_progress"/>
<corners android:radius="10dp"/>
</shape>
</clip>
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>
</shape>
</item>
</layer-list>

8
mastodon/src/main/res/drawable/bg_round_ripple.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item android:id="@android:id/mask">
<shape android:shape="oval">
<solid android:color="#000"/>
</shape>
</item>
</ripple>

31
mastodon/src/main/res/drawable/bg_spoiler.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="?colorM3SecondaryContainer"/>
</item>
<item android:gravity="left" android:width="5dp">
<shape>
<gradient android:type="linear" android:angle="270" android:startColor="#FEC84B" android:endColor="#F79009"/>
</shape>
</item>
<item android:id="@+id/left_drawable" android:width="5dp" android:gravity="left">
<color android:color="#0f0"/>
</item>
<item android:gravity="right" android:width="5dp">
<shape>
<gradient android:type="linear" android:angle="270" android:startColor="#FEC84B" android:endColor="#F79009"/>
</shape>
</item>
<item android:id="@+id/right_drawable" android:width="5dp" android:gravity="right">
<color android:color="#0f0"/>
</item>
<item>
<ripple android:color="?android:colorControlHighlight">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
</shape>
</item>
</ripple>
</item>
</layer-list>

9
mastodon/src/main/res/drawable/ic_check_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M8.229,14.062 L4.708,10.521 5.75,9.479 8.229,11.938 14.25,5.938 15.292,7Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_forward_10_48px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="@android:color/white"
android:pathData="M18,32.5V21.9H15.3V19.45H20.5V32.5ZM25.35,32.5Q24.4,32.5 23.775,31.875Q23.15,31.25 23.15,30.3V21.65Q23.15,20.7 23.775,20.075Q24.4,19.45 25.35,19.45H29.5Q30.45,19.45 31.075,20.075Q31.7,20.7 31.7,21.65V30.3Q31.7,31.25 31.075,31.875Q30.45,32.5 29.5,32.5ZM25.65,30H29.2Q29.2,30 29.2,30Q29.2,30 29.2,30V21.9Q29.2,21.9 29.2,21.9Q29.2,21.9 29.2,21.9H25.65Q25.65,21.9 25.65,21.9Q25.65,21.9 25.65,21.9V30Q25.65,30 25.65,30Q25.65,30 25.65,30ZM24,44Q20.25,44 16.975,42.6Q13.7,41.2 11.25,38.75Q8.8,36.3 7.4,33.025Q6,29.75 6,26Q6,22.25 7.4,18.975Q8.8,15.7 11.25,13.25Q13.7,10.8 16.975,9.4Q20.25,8 24,8H25.05L21.15,4.1L23.2,2.05L30.55,9.4L23.2,16.75L21.15,14.7L24.85,11H24Q17.75,11 13.375,15.375Q9,19.75 9,26Q9,32.25 13.375,36.625Q17.75,41 24,41Q30.25,41 34.625,36.625Q39,32.25 39,26H42Q42,29.75 40.6,33.025Q39.2,36.3 36.75,38.75Q34.3,41.2 31.025,42.6Q27.75,44 24,44Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_more_vert_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M10,16Q9.375,16 8.938,15.562Q8.5,15.125 8.5,14.5Q8.5,13.875 8.938,13.438Q9.375,13 10,13Q10.625,13 11.062,13.438Q11.5,13.875 11.5,14.5Q11.5,15.125 11.062,15.562Q10.625,16 10,16ZM10,11.5Q9.375,11.5 8.938,11.062Q8.5,10.625 8.5,10Q8.5,9.375 8.938,8.938Q9.375,8.5 10,8.5Q10.625,8.5 11.062,8.938Q11.5,9.375 11.5,10Q11.5,10.625 11.062,11.062Q10.625,11.5 10,11.5ZM10,7Q9.375,7 8.938,6.562Q8.5,6.125 8.5,5.5Q8.5,4.875 8.938,4.438Q9.375,4 10,4Q10.625,4 11.062,4.438Q11.5,4.875 11.5,5.5Q11.5,6.125 11.062,6.562Q10.625,7 10,7Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_pause_48px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="@android:color/white"
android:pathData="M28.25,38V10H36V38ZM12,38V10H19.75V38Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_play_arrow_48px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="@android:color/white"
android:pathData="M16,37.85V9.85L38,23.85ZM19,23.85ZM19,32.4 L32.45,23.85 19,15.3Z"/>
</vector>

4
mastodon/src/main/res/drawable/ic_poll_check.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@drawable/ic_check_20px"/>
</selector>

9
mastodon/src/main/res/drawable/ic_repeat_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M5.875,18.333 L2.5,14.958 5.792,11.667 7.042,12.917 5.875,14.083H14.083V10.833H15.833V15.833H5.875L7.125,17.083ZM4.167,9.167V4.167H14.125L12.875,2.917L14.125,1.667L17.5,5.042L14.188,8.354L12.938,7.104L14.125,5.917H5.917V9.167Z"/>
</vector>

5
mastodon/src/main/res/drawable/ic_repeat_selector.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_repeat_wght700grad200fill1_20px" android:state_selected="true"/>
<item android:drawable="@drawable/ic_repeat_20px"/>
</selector>

9
mastodon/src/main/res/drawable/ic_repeat_wght700grad200fill1_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M5.812,18.792 L2.042,15.021 5.729,11.354 7.354,12.979 6.417,13.875H13.896V10.604H16.188V16.167H6.417L7.438,17.167ZM3.833,9.375V3.812H13.583L12.562,2.812L14.188,1.188L17.958,4.958L14.25,8.667L12.625,7.042L13.583,6.104H6.125V9.375Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_replay_5_48px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="@android:color/white"
android:pathData="M24,44Q20.25,44 16.975,42.6Q13.7,41.2 11.25,38.75Q8.8,36.3 7.4,33.025Q6,29.75 6,26H9Q9,32.25 13.375,36.625Q17.75,41 24,41Q30.25,41 34.625,36.625Q39,32.25 39,26Q39,19.75 34.75,15.375Q30.5,11 24.25,11H23.15L26.8,14.65L24.7,16.75L17.35,9.4L24.7,2.05L26.75,4.1L22.85,8H24Q27.75,8 31.025,9.4Q34.3,10.8 36.75,13.25Q39.2,15.7 40.6,18.975Q42,22.25 42,26Q42,29.75 40.6,33.025Q39.2,36.3 36.75,38.75Q34.3,41.2 31.025,42.6Q27.75,44 24,44ZM19,32.5V30H25.35V27.2H19V19.45H27.8V21.9H21.5V24.75H26.1Q26.8,24.75 27.3,25.25Q27.8,25.75 27.8,26.45V30.8Q27.8,31.5 27.3,32Q26.8,32.5 26.1,32.5Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_reply_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M15.5,15.625V12.625Q15.5,11.583 14.771,10.854Q14.042,10.125 13,10.125H5.875L8.438,12.688L7.375,13.75L3,9.375L7.375,5L8.438,6.062L5.875,8.625H13Q14.667,8.625 15.833,9.792Q17,10.958 17,12.625V15.625Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_share_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M14.958,18.333Q13.896,18.333 13.167,17.594Q12.438,16.854 12.438,15.792Q12.438,15.646 12.458,15.5Q12.479,15.354 12.521,15.229L6.75,11.896Q6.396,12.208 5.958,12.385Q5.521,12.562 5.042,12.562Q3.979,12.562 3.24,11.823Q2.5,11.083 2.5,10.021Q2.5,8.958 3.24,8.219Q3.979,7.479 5.042,7.479Q5.521,7.479 5.958,7.646Q6.396,7.812 6.75,8.125L12.521,4.792Q12.479,4.667 12.448,4.521Q12.417,4.375 12.417,4.229Q12.417,3.167 13.156,2.427Q13.896,1.688 14.958,1.688Q16.021,1.688 16.76,2.427Q17.5,3.167 17.5,4.229Q17.5,5.292 16.76,6.031Q16.021,6.771 14.958,6.771Q14.479,6.771 14.052,6.594Q13.625,6.417 13.271,6.104L7.5,9.438Q7.542,9.562 7.562,9.719Q7.583,9.875 7.583,10.021Q7.583,10.146 7.562,10.302Q7.542,10.458 7.5,10.583L13.271,13.917Q13.625,13.604 14.052,13.427Q14.479,13.25 14.958,13.25Q16.021,13.25 16.76,13.99Q17.5,14.729 17.5,15.792Q17.5,16.854 16.76,17.594Q16.021,18.333 14.958,18.333ZM14.958,5.021Q15.292,5.021 15.521,4.792Q15.75,4.562 15.75,4.229Q15.75,3.896 15.521,3.667Q15.292,3.438 14.958,3.438Q14.625,3.438 14.396,3.667Q14.167,3.896 14.167,4.229Q14.167,4.562 14.396,4.792Q14.625,5.021 14.958,5.021ZM5.042,10.812Q5.375,10.812 5.604,10.583Q5.833,10.354 5.833,10.021Q5.833,9.688 5.604,9.458Q5.375,9.229 5.042,9.229Q4.708,9.229 4.479,9.458Q4.25,9.688 4.25,10.021Q4.25,10.354 4.479,10.583Q4.708,10.812 5.042,10.812ZM14.958,16.583Q15.292,16.583 15.521,16.354Q15.75,16.125 15.75,15.792Q15.75,15.458 15.521,15.229Q15.292,15 14.958,15Q14.625,15 14.396,15.229Q14.167,15.458 14.167,15.792Q14.167,16.125 14.396,16.354Q14.625,16.583 14.958,16.583ZM14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229Q14.958,4.229 14.958,4.229ZM5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021Q5.042,10.021 5.042,10.021ZM14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Q14.958,15.792 14.958,15.792Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_star_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M7.333,14.896 L10,13.312 12.688,14.896 11.979,11.896 14.292,9.917 11.229,9.646 10,6.792 8.771,9.646 5.708,9.917 8.042,11.896ZM5.062,18 L6.375,12.458 2,8.729 7.75,8.229 10,3 12.25,8.25 18,8.729 13.625,12.458 14.938,18 10,15.062ZM10,11.062Z"/>
</vector>

5
mastodon/src/main/res/drawable/ic_star_selector.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_star_wght700grad200fill1_20px" android:state_selected="true"/>
<item android:drawable="@drawable/ic_star_20px"/>
</selector>

9
mastodon/src/main/res/drawable/ic_star_wght700grad200fill1_20px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@android:color/white"
android:pathData="M3.958,19.708 L6.25,12.292 0.125,7.792H7.583L10,0.062L12.417,7.792H19.875L13.75,12.292L16.062,19.708L10.021,15.104Z"/>
</vector>

80
mastodon/src/main/res/layout/display_item_audio.xml
View File

@@ -3,52 +3,60 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-8dp"
android:layout_marginBottom="-8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false">
<LinearLayout
<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:background="?buttonBackground"
android:outlineProvider="background"
android:elevation="2dp">
<ImageButton
android:id="@+id/play_pause_btn"
android:layout_width="24dp"
android:layout_height="24dp"
android:background="?android:selectableItemBackgroundBorderless"
android:tint="?colorButtonText"
android:src="@drawable/ic_fluent_play_circle_24_filled"/>
<SeekBar
android:id="@+id/seekbar"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:progressDrawable="@drawable/seekbar_progress"
android:max="10000"
android:splitTrack="false"/>
android:layout_height="188dp">
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_medium"
android:layout_height="20dp"
android:layout_margin="8dp"
android:layout_gravity="bottom|start"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorButtonText"
android:gravity="end"
android:gravity="center_vertical"
android:singleLine="true"
android:fontFeatureSettings="'tnum'"
tools:text="1:23"/>
<ImageView
android:id="@+id/image"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center"
android:importantForAccessibility="no"
tools:src="#0f0"/>
</LinearLayout>
<ImageButton
android:id="@+id/play_pause_btn"
android:layout_width="96dp"
android:layout_height="96dp"
android:background="@drawable/bg_audio_play_button"
android:layout_gravity="center"
android:src="@drawable/ic_play_arrow_48px"/>
<ImageButton
android:id="@+id/forward_btn"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center_vertical|end"
android:layout_margin="16dp"
android:src="@drawable/ic_forward_10_48px"
android:background="@drawable/bg_round_ripple"/>
<ImageButton
android:id="@+id/rewind_btn"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_gravity="center_vertical|start"
android:layout_margin="16dp"
android:src="@drawable/ic_replay_5_48px"
android:background="@drawable/bg_round_ripple"/>
</FrameLayout>
</FrameLayout>

60
mastodon/src/main/res/layout/display_item_footer.xml
View File

@@ -3,25 +3,30 @@
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingLeft="20dp"
android:paddingRight="20dp">
android:layout_height="42dp"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp">
<FrameLayout
android:id="@+id/reply_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="56dp">
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="?android:actionBarItemBackground"
android:minWidth="34dp">
<TextView
android:id="@+id/reply"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center"
android:drawableStart="@drawable/ic_fluent_chat_multiple_24_regular"
android:drawablePadding="8dp"
android:drawableTint="?android:textColorSecondary"
android:drawableStart="@drawable/ic_reply_20px"
android:drawablePadding="6dp"
android:drawableTint="?colorM3OnSurfaceVariant"
android:textColor="?colorM3OnSurfaceVariant"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
android:textAppearance="@style/m3_label_medium"
tools:text="123"/>
</FrameLayout>
@@ -34,18 +39,21 @@
android:id="@+id/boost_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="56dp">
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="?android:actionBarItemBackground"
android:minWidth="34dp">
<TextView
android:id="@+id/boost"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center"
android:drawableStart="@drawable/ic_boost"
android:drawablePadding="8dp"
android:drawableTint="@color/boost_icon"
android:textColor="@color/boost_icon"
android:drawableStart="@drawable/ic_repeat_selector"
android:drawablePadding="6dp"
android:drawableTint="?colorM3OnSurfaceVariant"
android:textColor="?colorM3OnSurfaceVariant"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
android:textAppearance="@style/m3_label_medium"
tools:text="123"/>
</FrameLayout>
@@ -58,18 +66,21 @@
android:id="@+id/favorite_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="56dp">
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="?android:actionBarItemBackground"
android:minWidth="34dp">
<TextView
android:id="@+id/favorite"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center"
android:drawableStart="@drawable/ic_fluent_star_24_selector"
android:drawablePadding="8dp"
android:drawableTint="@color/favorite_icon"
android:textColor="@color/favorite_icon"
android:drawableStart="@drawable/ic_star_selector"
android:drawablePadding="6dp"
android:drawableTint="?colorM3OnSurfaceVariant"
android:textColor="?colorM3OnSurfaceVariant"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large"
android:textAppearance="@style/m3_label_medium"
tools:text="123"/>
</FrameLayout>
@@ -82,14 +93,17 @@
android:id="@+id/share_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="56dp">
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="?android:actionBarItemBackground"
android:minWidth="34dp">
<ImageView
android:id="@+id/share"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:layout_gravity="center"
android:src="@drawable/ic_fluent_share_24_regular"
android:tint="?android:textColorSecondary"
android:src="@drawable/ic_share_20px"
android:tint="?colorM3OnSurfaceVariant"
android:gravity="center_vertical"/>
</FrameLayout>

69
mastodon/src/main/res/layout/display_item_header.xml
View File

@@ -13,30 +13,22 @@
android:layout_height="24dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="-2dp"
android:layout_marginEnd="-2dp"
android:background="?android:selectableItemBackgroundBorderless"
android:scaleType="center"
android:tint="?android:textColorSecondary"
android:tint="?colorM3OnSurfaceVariant"
android:contentDescription="@string/more_options"
android:src="@drawable/ic_post_more" />
<ImageView
android:id="@+id/visibility"
android:layout_width="24dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_below="@id/more"
android:background="?android:selectableItemBackgroundBorderless"
android:scaleType="center"
android:tint="?android:textColorSecondary"
android:src="@drawable/ic_visibility" />
android:src="@drawable/ic_more_vert_20px" />
<ImageView
android:id="@+id/avatar"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="12dp" />
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp" />
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
android:id="@+id/name_wrap"
@@ -53,7 +45,8 @@
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_medium"
android:textAlignment="viewStart"
android:textColor="?colorM3OnSurface"
android:gravity="start|center_vertical"
tools:text="Eugen" />
<TextView
@@ -66,46 +59,22 @@
android:textAppearance="@style/m3_title_medium"
android:fontFamily="sans-serif"
android:textAlignment="viewStart"
android:textColor="?colorM3OnSurface"
tools:text="boosted your cat picture" />
</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
<TextView
android:id="@+id/time_and_username"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_below="@id/name_wrap"
android:layout_toEndOf="@id/avatar"
android:layout_toStartOf="@id/visibility"
android:layoutDirection="locale"
android:orientation="horizontal">
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@style/m3_title_small"
tools:text="\@Gargron" />
<TextView
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:importantForAccessibility="no"
android:text="·"
android:textAppearance="@style/m3_title_small" />
<TextView
android:id="@+id/timestamp"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:textAppearance="@style/m3_title_small"
android:singleLine="true"
tools:text="3h" />
</org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout>
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="@style/m3_title_small"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="9h ago · \@Gargron@mastodon.social"/>
</RelativeLayout>

4
mastodon/src/main/res/layout/display_item_photo.xml
View File

@@ -17,8 +17,8 @@
android:layout_width="40dp"
android:layout_height="22dp"
android:layout_gravity="start|bottom"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:importantForAccessibility="no"

17
mastodon/src/main/res/layout/display_item_poll_footer.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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="wrap_content"
android:orientation="vertical">
@@ -8,20 +9,24 @@
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?android:textColorPrimary" />
android:layout_marginBottom="8dp"
android:textAppearance="@style/m3_body_medium"
android:gravity="center_vertical"
android:textColor="?colorM3OnSurfaceVariant"
tools:text="fdsafdsafsdafds"/>
<Button
android:id="@+id/vote_btn"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:enabled="false"
style="@style/Widget.Mastodon.M3.Button.Filled"
android:text="@string/action_vote"/>
</LinearLayout>

65
mastodon/src/main/res/layout/display_item_poll_option.xml
View File

@@ -5,53 +5,60 @@
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingBottom="8dp"
android:clipToPadding="false">
<LinearLayout
android:id="@+id/button"
android:layout_width="match_parent"
android:layout_height="48dp"
android:outlineProvider="background"
android:elevation="2dp"
android:layout_height="40dp"
android:background="@drawable/bg_poll_option_clickable"
android:duplicateParentState="true"
android:layoutDirection="locale">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
android:layout_gravity="center_vertical"
android:duplicateParentState="true"
android:tint="?colorDarkIcon"
android:src="@drawable/ic_poll_option_button"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Primary"
android:singleLine="true"
android:ellipsize="end"
android:paddingEnd="26dp"
tools:text="scream into void jsfdklfjdalskfjdsalkfjdsalkfjdsalkfdjsalkfdsajlk"/>
<ImageView
android:id="@+id/checkbox"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="-26dp"
android:tint="?colorM3OnSecondaryContainer"
android:scaleType="center"
android:src="@drawable/ic_poll_check" />
</LinearLayout>
<TextView
android:id="@+id/percent"
android:layout_width="46dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:textAppearance="@style/m3_title_medium"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3OnSecondaryContainer"
android:visibility="gone"
android:gravity="end"
tools:visibility="visible"
tools:text="00.0%"/>
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="scream into void"/>
</LinearLayout>
</FrameLayout>

8
mastodon/src/main/res/layout/display_item_reblog_or_reply_line.xml
View File

@@ -2,7 +2,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-6dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp">
@@ -11,9 +10,10 @@
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"
android:drawableTint="?android:textColorSecondary"
android:textAppearance="@style/m3_label_large"
android:drawableStart="@drawable/ic_repeat_20px"
android:drawableTint="?colorM3OnSurfaceVariant"
android:textColor="?colorM3OnSurfaceVariant"
android:drawablePadding="6dp"
android:singleLine="true"
android:ellipsize="end"/>

42
mastodon/src/main/res/layout/display_item_spoiler.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingTop="16dp"
android:paddingRight="16dp">
<LinearLayout
android:id="@+id/spoiler_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/bg_spoiler"
android:paddingLeft="12dp"
android:paddingTop="8dp"
android:paddingRight="12dp"
android:paddingBottom="8dp">
<TextView
android:id="@+id/spoiler_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSecondaryContainer"
tools:text="Spoilery stuff"/>
<TextView
android:id="@+id/spoiler_action"
android:layout_width="match_parent"
android:layout_height="20dp"
android:textAppearance="@style/m3_label_large"
android:singleLine="true"
android:gravity="center_vertical"
android:textColor="?colorM3Primary"
tools:text="Re-hide"/>
</LinearLayout>
</FrameLayout>

29
mastodon/src/main/res/layout/display_item_text.xml
View File

@@ -5,38 +5,15 @@
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="10dp"
android:paddingBottom="12dp">
android:paddingTop="16dp"
android:paddingBottom="8dp">
<org.joinmastodon.android.ui.views.LinkedTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="?colorM3OnSurface"
android:textAppearance="@style/m3_body_large"/>
<LinearLayout
android:id="@+id/spoiler_overlay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/spoiler_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/m3_title_large"
tools:text="CW title"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center_horizontal"
android:text="@string/tap_to_reveal"/>
</LinearLayout>
</FrameLayout>

4
mastodon/src/main/res/layout/overlay_image_alt_text.xml
View File

@@ -5,8 +5,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|bottom"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:importantForAccessibility="noHideDescendants"

9
mastodon/src/main/res/values/strings.xml
View File

@@ -103,9 +103,9 @@
<item quantity="one">%d day left</item>
<item quantity="other">%d days left</item>
</plurals>
<plurals name="x_voters">
<item quantity="one">%,d voter</item>
<item quantity="other">%,d voters</item>
<plurals name="x_votes">
<item quantity="one">%,d vote</item>
<item quantity="other">%,d votes</item>
</plurals>
<string name="poll_closed">Closed</string>
<string name="confirm_mute_title">Mute Account</string>
@@ -438,4 +438,7 @@
<!-- %1$s is server domain, %2$s is email domain. You can reorder these placeholders to fit your language better. -->
<string name="signup_email_domain_blocked">%1$s doesn\'t allow signups from %2$s. Try a different one or &lt;a>pick a different server&lt;/a>.</string>
<string name="signup_username_taken">This username is taken.</string>
<string name="spoiler_show">Show anyway</string>
<string name="spoiler_hide">Re-hide</string>
<string name="poll_multiple_choice">Choose one or more</string>
</resources>

5
mastodon/src/main/res/values/styles.xml
View File

@@ -4,7 +4,6 @@
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">?colorWindowBackground</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
@@ -23,7 +22,6 @@
<item name="colorBackgroundLight">@color/gray_50</item>
<item name="colorBackgroundLightest">@color/gray_25</item>
<item name="colorDarkIcon">@color/gray_900</item>
<item name="colorWindowBackground">@color/white</item>
<item name="android:statusBarColor">@color/gray_50</item>
<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
@@ -70,13 +68,14 @@
<item name="colorM3OnError">#FFF</item>
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
<item name="colorWindowBackground">?colorM3Background</item>
</style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
<!-- needed to disable scrim on API 29+ -->
<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">?colorWindowBackground</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>