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

Add timeline action

This commit is contained in:
Thomas 2023-07-07 16:01:09 +02:00
parent 04355116f4
commit a53ac333e3
8 changed files with 117 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
View File

@ -844,6 +844,8 @@ public class ProfileActivity extends BaseActivity {
instanceType = RemoteInstance.InstanceType.PIXELFED;
} else if (nodeInfo.software.name.compareToIgnoreCase("misskey") == 0) {
instanceType = RemoteInstance.InstanceType.MISSKEY;
} else if (nodeInfo.software.name.compareToIgnoreCase("lemmy") == 0) {
instanceType = RemoteInstance.InstanceType.LEMMY;
} else if (nodeInfo.software.name.compareToIgnoreCase("gnu") == 0) {
instanceType = RemoteInstance.InstanceType.GNU;
} else {

5
app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
View File

@ -203,6 +203,9 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.misskey_instance) {
url = "https://" + instanceName + "/api/notes/local-timeline";
getCall = false;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.lemmy_instance) {
url = "https://" + instanceName + "/api/v3/post/list";
getCall = false;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
url = "https://" + instanceName + "/api/statuses/public_timeline.json";
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
@ -248,6 +251,8 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
instanceType = RemoteInstance.InstanceType.PIXELFED;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.misskey_instance) {
instanceType = RemoteInstance.InstanceType.MISSKEY;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.lemmy_instance) {
instanceType = RemoteInstance.InstanceType.LEMMY;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
instanceType = RemoteInstance.InstanceType.GNU;
} else if (popupSearchInstanceBinding.setAttachmentGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {

2
app/src/main/java/app/fedilab/android/mastodon/client/entities/app/RemoteInstance.java
View File

@ -48,6 +48,8 @@ public class RemoteInstance implements Serializable {
NITTER("NITTER"),
@SerializedName("MISSKEY")
MISSKEY("MISSKEY"),
@SerializedName("LEMMY")
LEMMY("LEMMY"),
@SerializedName("GNU")
GNU("GNU");

3
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ReorderTabAdapter.java
View File

@ -94,6 +94,9 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
case MISSKEY:
holder.binding.icon.setImageResource(R.drawable.misskey);
break;
case LEMMY:
holder.binding.icon.setImageResource(R.drawable.lemmy);
break;
case GNU:
holder.binding.icon.setImageResource(R.drawable.ic_gnu_social);
break;

49
app/src/main/res/layouts/mastodon/drawable/lemmy.xml Normal file
View File

@ -0,0 +1,49 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#00000000"
android:fillType="nonZero"
android:pathData="m167,244.7c-0.9,-0 -1.9,0 -2.8,0 -4.3,0.1 -8.6,0.4 -12.8,0.8 -33.8,3.9 -64.2,21.9 -82.9,53.3 -18.3,30.8 -22.8,64.7 -13.5,96.1 9.3,31.4 31.9,59.9 65.3,82.5 0.2,0.1 0.4,0.3 0.6,0.4 28.7,17.3 57.2,28.9 87.7,35 -0.7,12.6 -0.7,25.6 0.1,38.8 2.4,40.1 16.6,77 38.1,109.7l-77,31.4c-8.3,3.3 -12.3,12.7 -9,20.9 3.4,8.3 12.8,12.2 21.1,8.7l84.7,-34.6c15.7,18.7 33.8,35.7 53.1,50.6 0.7,0.6 1.5,1.1 2.2,1.7l-49.6,65.7c-5.5,7 -4.1,17.2 3,22.6 7.1,5.4 17.2,3.9 22.5,-3.3l50.4,-66.7c27.7,17.5 57.1,31.2 86.1,40.3 14.9,27.3 44,44.6 77.6,44.6 33.9,0 63,-18.7 77.8,-45.4 28.7,-9.2 57.8,-22.9 85.1,-40.4l51.1,67.7c5.3,7.2 15.4,8.6 22.5,3.3 7.1,-5.4 8.5,-15.5 3,-22.6l-50.4,-66.7c0.3,-0.3 0.7,-0.5 1,-0.8 19.1,-14.6 37,-31.3 52.7,-49.6l82.6,33.7c8.2,3.5 17.7,-0.4 21.1,-8.7 3.4,-8.3 -0.7,-17.7 -9,-20.9l-74.5,-30.4c22.2,-32.8 37,-70 40.1,-110.5 1,-13.4 1.2,-26.4 0.6,-39.2 30.4,-6.1 58.7,-17.7 87.2,-34.8 0.2,-0.1 0.4,-0.3 0.6,-0.4 33.4,-22.6 56,-51.1 65.3,-82.5 9.3,-31.4 4.8,-65.3 -13.5,-96.1 -18.7,-31.4 -49.1,-49.4 -82.9,-53.3 -4.2,-0.5 -8.5,-0.8 -12.8,-0.8 -30.2,-0.5 -62.4,8.8 -93.4,26.7 -22.8,13.2 -43.4,33.3 -59.4,55.3 -45,-25.8 -103.5,-40.3 -175.5,-41.4 -6.5,-0.1 -13,-0.1 -19.7,0 -80.2,1.3 -144.4,16.5 -192.9,44 -0.1,-0.2 -0.2,-0.4 -0.4,-0.6 -16.3,-22.8 -37.4,-43.7 -60.9,-57.3 -30,-17.3 -61.2,-26.7 -90.6,-26.7z"
android:strokeWidth="28"
android:strokeColor="#ffffff"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#ffffff"
android:pathData="m716.9,336.9c15.3,-21.4 35.4,-41.1 56.5,-53.3 66.7,-38.5 137,-33.2 170.1,22.4 33.1,55.7 15,117.5 -47.6,159.9 -32,19.3 -62.9,30.9 -97.2,35.5M307.1,336.9C291.9,315.5 271.8,295.8 250.6,283.6 184,245.1 113.6,250.4 80.6,306 47.5,361.7 65.6,423.5 128.2,465.9c32,19.3 62.9,30.9 97.2,35.5"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#ffffff"
android:pathData="M801.2,550.8C812.7,401 720.6,295.9 512,299.3 303.4,302.7 213.7,402 222.8,550.8c8.6,142.1 176.8,246.4 288.1,246.4 111.3,0 279.5,-104.5 290.3,-246.4z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#000000"
android:pathData="m610.5,618.2c0,23.1 18.7,41.8 41.8,41.8 23.1,0 41.8,-18.7 41.8,-41.8 0,-23.1 -18.7,-41.8 -41.8,-41.8 -23.1,0 -41.8,18.7 -41.8,41.8zM329.9,618.2c0,23.3 18.9,42.2 42.2,42.2 23.3,0 42.2,-18.9 42.2,-42.2 0,-23.3 -18.9,-42.2 -42.2,-42.2 -23.3,0 -42.2,18.9 -42.2,42.2z"
android:strokeWidth="0"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:pathData="m339.7,743.2 l-54.5,72.2m399.1,-72.2 l54.5,72.2M263.7,671.8 L175.9,707.6m579.9,-35.8 l87.8,35.8"
android:strokeWidth="32"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="miter" />
<path
android:fillColor="#ffffff"
android:pathData="m512,687c-45.9,0 -75.1,31.8 -74.1,71.1 1.1,42.5 32.5,71.1 74.1,71.1 41.7,0 74.1,-33 74.1,-71.1 0.1,-39.3 -28.3,-71.1 -74.1,-71.1z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

49
app/src/main/res/layouts/mastodon/drawable/lemmy_logo.xml Normal file
View File

@ -0,0 +1,49 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#00000000"
android:fillType="nonZero"
android:pathData="m167,244.7c-0.9,-0 -1.9,0 -2.8,0 -4.3,0.1 -8.6,0.4 -12.8,0.8 -33.8,3.9 -64.2,21.9 -82.9,53.3 -18.3,30.8 -22.8,64.7 -13.5,96.1 9.3,31.4 31.9,59.9 65.3,82.5 0.2,0.1 0.4,0.3 0.6,0.4 28.7,17.3 57.2,28.9 87.7,35 -0.7,12.6 -0.7,25.6 0.1,38.8 2.4,40.1 16.6,77 38.1,109.7l-77,31.4c-8.3,3.3 -12.3,12.7 -9,20.9 3.4,8.3 12.8,12.2 21.1,8.7l84.7,-34.6c15.7,18.7 33.8,35.7 53.1,50.6 0.7,0.6 1.5,1.1 2.2,1.7l-49.6,65.7c-5.5,7 -4.1,17.2 3,22.6 7.1,5.4 17.2,3.9 22.5,-3.3l50.4,-66.7c27.7,17.5 57.1,31.2 86.1,40.3 14.9,27.3 44,44.6 77.6,44.6 33.9,0 63,-18.7 77.8,-45.4 28.7,-9.2 57.8,-22.9 85.1,-40.4l51.1,67.7c5.3,7.2 15.4,8.6 22.5,3.3 7.1,-5.4 8.5,-15.5 3,-22.6l-50.4,-66.7c0.3,-0.3 0.7,-0.5 1,-0.8 19.1,-14.6 37,-31.3 52.7,-49.6l82.6,33.7c8.2,3.5 17.7,-0.4 21.1,-8.7 3.4,-8.3 -0.7,-17.7 -9,-20.9l-74.5,-30.4c22.2,-32.8 37,-70 40.1,-110.5 1,-13.4 1.2,-26.4 0.6,-39.2 30.4,-6.1 58.7,-17.7 87.2,-34.8 0.2,-0.1 0.4,-0.3 0.6,-0.4 33.4,-22.6 56,-51.1 65.3,-82.5 9.3,-31.4 4.8,-65.3 -13.5,-96.1 -18.7,-31.4 -49.1,-49.4 -82.9,-53.3 -4.2,-0.5 -8.5,-0.8 -12.8,-0.8 -30.2,-0.5 -62.4,8.8 -93.4,26.7 -22.8,13.2 -43.4,33.3 -59.4,55.3 -45,-25.8 -103.5,-40.3 -175.5,-41.4 -6.5,-0.1 -13,-0.1 -19.7,0 -80.2,1.3 -144.4,16.5 -192.9,44 -0.1,-0.2 -0.2,-0.4 -0.4,-0.6 -16.3,-22.8 -37.4,-43.7 -60.9,-57.3 -30,-17.3 -61.2,-26.7 -90.6,-26.7z"
android:strokeWidth="28"
android:strokeColor="#ffffff"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#ffffff"
android:pathData="m716.9,336.9c15.3,-21.4 35.4,-41.1 56.5,-53.3 66.7,-38.5 137,-33.2 170.1,22.4 33.1,55.7 15,117.5 -47.6,159.9 -32,19.3 -62.9,30.9 -97.2,35.5M307.1,336.9C291.9,315.5 271.8,295.8 250.6,283.6 184,245.1 113.6,250.4 80.6,306 47.5,361.7 65.6,423.5 128.2,465.9c32,19.3 62.9,30.9 97.2,35.5"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#ffffff"
android:pathData="M801.2,550.8C812.7,401 720.6,295.9 512,299.3 303.4,302.7 213.7,402 222.8,550.8c8.6,142.1 176.8,246.4 288.1,246.4 111.3,0 279.5,-104.5 290.3,-246.4z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#000000"
android:pathData="m610.5,618.2c0,23.1 18.7,41.8 41.8,41.8 23.1,0 41.8,-18.7 41.8,-41.8 0,-23.1 -18.7,-41.8 -41.8,-41.8 -23.1,0 -41.8,18.7 -41.8,41.8zM329.9,618.2c0,23.3 18.9,42.2 42.2,42.2 23.3,0 42.2,-18.9 42.2,-42.2 0,-23.3 -18.9,-42.2 -42.2,-42.2 -23.3,0 -42.2,18.9 -42.2,42.2z"
android:strokeWidth="0"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:pathData="m339.7,743.2 l-54.5,72.2m399.1,-72.2 l54.5,72.2M263.7,671.8 L175.9,707.6m579.9,-35.8 l87.8,35.8"
android:strokeWidth="32"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="miter" />
<path
android:fillColor="#ffffff"
android:pathData="m512,687c-45.9,0 -75.1,31.8 -74.1,71.1 1.1,42.5 32.5,71.1 74.1,71.1 41.7,0 74.1,-33 74.1,-71.1 0.1,-39.3 -28.3,-71.1 -74.1,-71.1z"
android:strokeWidth="28"
android:strokeColor="#000000"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

6
app/src/main/res/layouts/mastodon/layout/popup_search_instance.xml
View File

@ -43,6 +43,12 @@
android:layout_height="wrap_content"
android:text="@string/misskey_instance" />
<RadioButton
android:id="@+id/lemmy_instance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lemmy_instance" />
<RadioButton
android:id="@+id/gnu_instance"
android:layout_width="wrap_content"

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

@ -389,6 +389,7 @@
<string name="some_tags">Add some words to filter (space-separated)</string>
<string name="change_tag_column">Change column name</string>
<string name="misskey_instance">Misskey instance</string>
<string name="lemmy_instance">Lemmy instance</string>
<string name="trending">Trending</string>
<string name="local">Local</string>
<string name="category">Category</string>