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

Discover stuff

Browse Source
This commit is contained in:
Grishka
2022-03-02 12:38:14 +03:00
parent bb9cf5f5df
commit 9f0b55918d
41 changed files with 1435 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/res/color/discover_tab.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:color="?android:textColorPrimary" android:state_selected="true"/>
<item android:color="?colorTabInactive"/>
</selector>

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

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?android:statusBarColor"/>
</shape>
</item>
<item android:height="2dp" android:gravity="bottom">
<shape>
<solid android:color="?colorPollVoted"/>
</shape>
</item>
</layer-list>

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

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorSearchField"/>
<corners android:radius="6dp"/>
</shape>

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

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="14dp"/>
<stroke android:width="2dp" android:color="?colorBackgroundLight"/>
</shape>

3
mastodon/src/main/res/drawable/ic_fluent_search_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M10 2.75c4.004 0 7.25 3.246 7.25 7.25 0 1.732-0.607 3.322-1.62 4.569l4.9 4.9c0.293 0.294 0.293 0.768 0 1.061-0.266 0.267-0.683 0.29-0.976 0.073L19.47 20.53l-4.901-4.9c-1.247 1.013-2.837 1.62-4.569 1.62-4.004 0-7.25-3.246-7.25-7.25S5.996 2.75 10 2.75zm0 1.5c-3.176 0-5.75 2.574-5.75 5.75s2.574 5.75 5.75 5.75 5.75-2.574 5.75-5.75S13.176 4.25 10 4.25z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

62
mastodon/src/main/res/layout/fragment_discover.xml Normal file
View File

@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.FragmentRootLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingBottom="16dp"
android:background="?android:statusBarColor">
<EditText
android:id="@+id/search_edit"
android:layout_width="match_parent"
android:layout_height="40dp"
android:hint="@string/search_hint"
android:textColorHint="?colorSearchHint"
android:textColor="?android:textColorPrimary"
android:textSize="16dp"
android:singleLine="true"
android:inputType="textFilter"
android:paddingLeft="48dp"
android:paddingRight="48dp"
android:elevation="0dp"
android:background="@drawable/bg_search_field"/>
<ImageButton
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="start"
android:layout_marginStart="4dp"
android:background="?android:selectableItemBackgroundBorderless"
android:tint="?colorSearchHint"
android:src="@drawable/ic_fluent_search_24_regular"/>
</FrameLayout>
<org.joinmastodon.android.ui.tabs.TabLayout
android:id="@+id/tabbar"
android:layout_width="match_parent"
android:layout_height="48dp"
app:tabGravity="start"
app:tabMinWidth="120dp"
app:tabIndicator="@drawable/mtrl_tabs_default_indicator"
app:tabIndicatorAnimationMode="elastic"
app:tabIndicatorColor="?android:textColorPrimary"
app:tabMode="scrollable"
android:background="@drawable/bg_discover_tabs"/>
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
</me.grishka.appkit.views.FragmentRootLinearLayout>

179
mastodon/src/main/res/layout/item_discover_account.xml Normal file
View File

@@ -0,0 +1,179 @@
<?xml version="1.0" encoding="utf-8"?>
<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="wrap_content"
android:background="?colorBackgroundLight"
android:elevation="2dp"
android:paddingBottom="16dp">
<ImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="128dp"
android:layout_marginTop="4dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:scaleType="centerCrop"
tools:src="#0f0"/>
<View
android:id="@+id/avatar_border"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_below="@id/cover"
android:layout_alignParentStart="true"
android:layout_marginTop="-6dp"
android:layout_marginStart="14dp"
android:background="@drawable/discover_ava_bg"/>
<ImageView
android:id="@+id/avatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_below="@id/cover"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_marginTop="-4dp"
android:scaleType="centerCrop"
tools:src="#f00" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_toEndOf="@id/avatar"
android:layout_below="@id/cover"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:textAppearance="@style/m3_title_medium"
tools:text="Eugen"/>
<TextView
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_alignLeft="@id/name"
android:layout_alignRight="@id/name"
android:layout_below="@id/name"
android:singleLine="true"
android:ellipsize="end"
android:gravity="center_vertical"
android:textAppearance="@style/m3_title_small"
tools:text="\@Gargron@mastodon.social"/>
<TextView
android:id="@+id/bio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/avatar"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:textAppearance="@style/m3_body_large"
tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
<LinearLayout
android:id="@+id/posts_btn"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_below="@id/bio"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/posts_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
tools:text="123" />
<TextView
android:id="@+id/posts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
tools:text="following" />
</LinearLayout>
<LinearLayout
android:id="@+id/followers_btn"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_toEndOf="@id/posts_btn"
android:layout_alignTop="@id/posts_btn"
android:layout_marginStart="12dp"
android:orientation="vertical"
android:gravity="center_horizontal">
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
tools:text="123"/>
<TextView
android:id="@+id/followers_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
tools:text="following"/>
</LinearLayout>
<LinearLayout
android:id="@+id/following_btn"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignTop="@id/posts_btn"
android:layout_toEndOf="@id/followers_btn"
android:layout_marginStart="12dp"
android:orientation="vertical"
android:gravity="center_horizontal">
<TextView
android:id="@+id/following_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_large"
tools:text="123"/>
<TextView
android:id="@+id/following_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_title_small"
tools:text="following"/>
</LinearLayout>
<FrameLayout
android:id="@+id/action_btn_wrap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignTop="@id/posts_btn"
android:layout_marginTop="-8dp"
android:padding="8dp"
android:layout_marginEnd="8dp"
android:clipToPadding="false">
<org.joinmastodon.android.ui.views.ProgressBarButton
android:id="@+id/action_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Edit Profile"/>
<ProgressBar
android:id="@+id/action_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
style="?android:progressBarStyleSmall"
android:elevation="10dp"
android:outlineProvider="none"
android:indeterminateTint="?colorButtonText"
android:visibility="gone"/>
</FrameLayout>
</RelativeLayout>

40
mastodon/src/main/res/layout/item_trending_hashtag.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<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="64dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="12dp">
<org.joinmastodon.android.ui.views.HashtagChartView
android:id="@+id/chart"
android:layout_width="64dp"
android:layout_height="32dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="7dp"
android:layout_alignParentEnd="true"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/chart"
android:textAppearance="@style/m3_title_medium"
android:singleLine="true"
android:ellipsize="end"
tools:text="#mastodev"/>
<TextView
android:id="@+id/subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_toStartOf="@id/chart"
android:textAppearance="@style/m3_body_medium"
android:textColor="?android:textColorSecondary"
android:singleLine="true"
android:ellipsize="end"
tools:text="over 9000 people talking"/>
</RelativeLayout>

55
mastodon/src/main/res/layout/item_trending_link.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<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="wrap_content"
android:padding="16dp">
<ImageView
android:id="@+id/photo"
android:layout_width="132dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignBottom="@id/subtitle"
android:layout_marginStart="8dp"
android:scaleType="centerCrop"
tools:src="#0f0"/>
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toStartOf="@id/photo"
android:textAppearance="@style/m3_title_small"
android:textColor="?android:textColorPrimary"
android:singleLine="true"
android:ellipsize="end"
tools:text="Site Name"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/name"
android:layout_toStartOf="@id/photo"
android:layout_marginTop="4dp"
android:layout_marginBottom="32dp"
android:textAppearance="@style/m3_title_medium"
android:maxLines="5"
android:ellipsize="end"
tools:text="Title title title"/>
<TextView
android:id="@+id/subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_toStartOf="@id/photo"
android:textAppearance="@style/m3_label_medium"
android:textColor="?android:textColorSecondary"
android:singleLine="true"
android:ellipsize="end"
tools:text="Discussed 123 times"/>
</RelativeLayout>

4
mastodon/src/main/res/values/attrs.xml
View File

@@ -11,6 +11,10 @@
<attr name="secondaryButtonStyle" format="reference"/>
<attr name="buttonBackground" format="reference"/>
<attr name="colorAccentLight" format="color"/>
<attr name="colorSearchField" format="color"/>
<attr name="colorSearchHint" format="color"/>
<attr name="colorTabInactive" format="color"/>
<attr name="colorAccentLightest" format="color"/>
<declare-styleable name="MaxWidthFrameLayout">
<attr name="android:maxWidth" format="dimension"/>

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

@@ -6,4 +6,9 @@
<item name="profile_posts_with_replies" type="id"/>
<item name="profile_media" type="id"/>
<item name="profile_about" type="id"/>
<item name="discover_posts" type="id"/>
<item name="discover_hashtags" type="id"/>
<item name="discover_news" type="id"/>
<item name="discover_users" type="id"/>
</resources>

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

@@ -133,4 +133,16 @@
<string name="pause">Pause</string>
<string name="log_out">Log out</string>
<string name="add_account">Add account</string>
<string name="search_hint">Search</string>
<string name="hashtags">Hashtags</string>
<string name="news">News</string>
<string name="for_you">For you</string>
<plurals name="x_people_talking">
<item quantity="one">%d person is talking</item>
<item quantity="other">%d people are talking</item>
</plurals>
<plurals name="discussed_x_times">
<item quantity="one">Discussed %d time</item>
<item quantity="other">Discussed %d times</item>
</plurals>
</resources>

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

@@ -28,6 +28,10 @@
<item name="colorPollMostVoted">@color/primary_500</item>
<item name="colorPollVoted">@color/gray_300</item>
<item name="colorAccentLight">@color/primary_600</item>
<item name="colorSearchField">@color/gray_200</item>
<item name="colorSearchHint">@color/gray_600</item>
<item name="colorTabInactive">@color/gray_400</item>
<item name="colorAccentLightest">@color/primary_100</item>
<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
@@ -64,6 +68,12 @@
<item name="colorPollVoted">@color/gray_600</item>
<item name="colorAccentLight">@color/primary_600</item>
<!-- TODO dark colors -->
<item name="colorSearchField">@color/gray_200</item>
<item name="colorSearchHint">@color/gray_600</item>
<item name="colorTabInactive">@color/gray_400</item>
<item name="colorAccentLightest">@color/primary_100</item>
<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
<item name="android:windowLightStatusBar">false</item>
@@ -172,6 +182,7 @@
<style name="m3_body_large">
<item name="android:textSize">16dp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingExtra">5dp</item>
</style>
<style name="m3_body_medium">
@@ -183,6 +194,7 @@
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">16dp</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:lineSpacingExtra">5dp</item>
</style>
<style name="m3_title_small">