mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Reorder package

Browse source
This commit is contained in:
Thomas 2022-05-24 10:12:04 +02:00
parent 3071ceae6f
commit 8cac3ba7f4
164 changed files with 517 additions and 531 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View file

@ -95,14 +95,14 @@ import app.fedilab.android.activities.ScheduledActivity;
import app.fedilab.android.activities.SearchResultTabActivity;
import app.fedilab.android.activities.SettingsActivity;
import app.fedilab.android.broadcastreceiver.NetworkStateReceiver;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.BottomMenu;
import app.fedilab.android.client.entities.Pinned;
import app.fedilab.android.client.entities.api.Filter;
import app.fedilab.android.client.entities.api.Instance;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.BottomMenu;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.mastodon.entities.Filter;
import app.fedilab.android.client.mastodon.entities.Instance;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.databinding.ActivityMainBinding;
import app.fedilab.android.databinding.NavHeaderMainBinding;
import app.fedilab.android.exception.DBException;
@ -129,13 +129,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
public static Instance instanceInfo;
public static List<Filter> mainFilters;
public static boolean filterFetched;
public static boolean show_boosts, show_replies, show_art_nsfw;
public static String regex_home, regex_local, regex_public;
Fragment currentFragment;
private Account account;
private AppBarConfiguration mAppBarConfiguration;
private ActivityMainBinding binding;
private Pinned pinned;
public static boolean show_boosts, show_replies, show_art_nsfw;
public static String regex_home, regex_local, regex_public;
private BottomMenu bottomMenu;
private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
@ -302,8 +302,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
binding.navView.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
mAppBarConfiguration = new AppBarConfiguration.Builder()

2
app/src/main/java/app/fedilab/android/activities/ActionActivity.java
View file

@ -24,7 +24,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityActionsBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

23
app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
View file

@ -58,12 +58,12 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.StatusDraft;
import app.fedilab.android.client.mastodon.entities.Context;
import app.fedilab.android.client.mastodon.entities.Mention;
import app.fedilab.android.client.mastodon.entities.ScheduledStatus;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Context;
import app.fedilab.android.client.entities.api.Mention;
import app.fedilab.android.client.entities.api.ScheduledStatus;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityPaginationBinding;
import app.fedilab.android.databinding.PopupContactBinding;
import app.fedilab.android.exception.DBException;
@ -100,8 +100,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
private Uri photoFileUri;
private ScheduledStatus scheduledStatus;
private String visibility;
private app.fedilab.android.client.mastodon.entities.Account accountMention;
private app.fedilab.android.client.entities.api.Account accountMention;
private String statusReplyId;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -131,7 +132,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
instance = b.getString(Helper.ARG_INSTANCE, BaseMainActivity.currentInstance);
token = b.getString(Helper.ARG_TOKEN, BaseMainActivity.currentToken);
visibility = b.getString(Helper.ARG_VISIBILITY, null);
accountMention = (app.fedilab.android.client.mastodon.entities.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
}
binding.toolbar.setPopupTheme(Helper.popupStyle());
//Edit a scheduled status from server
@ -449,14 +450,14 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
}
private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.mastodon.entities.Account> accounts) {
private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.entities.api.Account> accounts) {
binding.loader.setVisibility(View.GONE);
if (accounts == null) {
accounts = new ArrayList<>();
}
List<Boolean> checkedValues = new ArrayList<>();
List<app.fedilab.android.client.mastodon.entities.Account> contacts = new ArrayList<>(accounts);
for (app.fedilab.android.client.mastodon.entities.Account account : contacts) {
List<app.fedilab.android.client.entities.api.Account> contacts = new ArrayList<>(accounts);
for (app.fedilab.android.client.entities.api.Account account : contacts) {
checkedValues.add(composeAdapter.getLastComposeContent().contains("@" + account.acct));
}
AccountsReplyAdapter contactAdapter = new AccountsReplyAdapter(contacts, checkedValues);

2
app/src/main/java/app/fedilab/android/activities/ContextActivity.java
View file

@ -32,7 +32,7 @@ import androidx.preference.PreferenceManager;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityConversationBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;

8
app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
View file

@ -32,10 +32,10 @@ import java.util.Set;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.mastodon.entities.Emoji;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.mastodon.entities.Tag;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.databinding.ActivityCustomSharingBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

6
app/src/main/java/app/fedilab/android/activities/DraftActivity.java
View file

@ -36,9 +36,9 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.StatusDraft;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityDraftsBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;

10
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
View file

@ -42,8 +42,8 @@ import java.util.Locale;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Field;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Field;
import app.fedilab.android.databinding.AccountFieldItemBinding;
import app.fedilab.android.databinding.ActivityEditProfileBinding;
import app.fedilab.android.exception.DBException;
@ -193,7 +193,7 @@ public class EditProfileActivity extends BaseActivity {
Helper.recreateMainActivity(EditProfileActivity.this);
new Thread(() -> {
try {
new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
} catch (DBException e) {
e.printStackTrace();
}
@ -213,7 +213,7 @@ public class EditProfileActivity extends BaseActivity {
BaseMainActivity.accountWeakReference.get().mastodon_account = account;
new Thread(() -> {
try {
new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
} catch (DBException e) {
e.printStackTrace();
}
@ -304,7 +304,7 @@ public class EditProfileActivity extends BaseActivity {
BaseMainActivity.accountWeakReference.get().mastodon_account = account;
new Thread(() -> {
try {
new app.fedilab.android.client.entities.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(BaseMainActivity.accountWeakReference.get());
sendBroadCast(account);
} catch (DBException e) {
e.printStackTrace();

2
app/src/main/java/app/fedilab/android/activities/FilterActivity.java
View file

@ -40,7 +40,7 @@ import java.util.Objects;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Filter;
import app.fedilab.android.client.entities.api.Filter;
import app.fedilab.android.databinding.ActivityFiltersBinding;
import app.fedilab.android.databinding.PopupAddFilterBinding;
import app.fedilab.android.helper.Helper;

8
app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
View file

@ -33,12 +33,12 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Pinned;
import app.fedilab.android.client.entities.StatusDraft;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.client.entities.app.TagTimeline;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityHashtagBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;

2
app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
View file

@ -31,7 +31,7 @@ import com.bumptech.glide.Glide;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Instance;
import app.fedilab.android.client.entities.api.Instance;
import app.fedilab.android.databinding.ActivityInstanceBinding;
import app.fedilab.android.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.InstancesVM;

2
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
View file

@ -31,7 +31,7 @@ import com.bumptech.glide.Glide;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.InstanceSocial;
import app.fedilab.android.client.entities.app.InstanceSocial;
import app.fedilab.android.databinding.ActivityInstanceSocialBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

2
app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java
View file

@ -36,7 +36,7 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.databinding.ActivityInstanceProfileBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

4
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
View file

@ -43,8 +43,8 @@ import java.util.regex.Matcher;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.WellKnownNodeinfo;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

6
app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java
View file

@ -41,9 +41,9 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityListBinding;
import app.fedilab.android.databinding.PopupAddListBinding;
import app.fedilab.android.databinding.PopupManageAccountsListBinding;

2
app/src/main/java/app/fedilab/android/activities/MediaActivity.java
View file

@ -53,7 +53,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.databinding.ActivityMediaPagerBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MediaHelper;

18
app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
View file

@ -74,17 +74,17 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Pinned;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.entities.WellKnownNodeinfo;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Field;
import app.fedilab.android.client.entities.api.IdentityProof;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.RemoteInstance;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.mastodon.entities.Field;
import app.fedilab.android.client.mastodon.entities.IdentityProof;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.mastodon.entities.RelationShip;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
import app.fedilab.android.databinding.ActivityProfileBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.CrossActionHelper;

8
app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
View file

@ -48,12 +48,12 @@ import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.BottomMenu;
import app.fedilab.android.client.entities.InstanceSocial;
import app.fedilab.android.client.entities.Pinned;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.entities.app.BottomMenu;
import app.fedilab.android.client.entities.app.InstanceSocial;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.RemoteInstance;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityReorderTabsBinding;
import app.fedilab.android.databinding.PopupSearchInstanceBinding;
import app.fedilab.android.exception.DBException;

8
app/src/main/java/app/fedilab/android/activities/ReportActivity.java
View file

@ -33,10 +33,10 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.RelationShip;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityReportBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

6
app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java
View file

@ -31,9 +31,9 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Accounts;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Accounts;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityStatusInfoBinding;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.ThemeHelper;

2
app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
View file

@ -53,7 +53,7 @@ import java.util.regex.Matcher;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.databinding.ActivityWebviewConnectBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;

2
app/src/main/java/app/fedilab/android/client/NodeInfoService.java
View file

@ -15,7 +15,7 @@ package app.fedilab.android.client;
* see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.entities.WellKnownNodeinfo;
import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Path;

4
app/src/main/java/app/fedilab/android/client/mastodon/JoinMastodonService.java → app/src/main/java/app/fedilab/android/client/endpoints/JoinMastodonService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.JoinMastodonInstance;
import app.fedilab.android.client.entities.api.JoinMastodonInstance;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Query;

26
app/src/main/java/app/fedilab/android/client/mastodon/MastodonAccountsService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,17 +17,17 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.FeaturedTag;
import app.fedilab.android.client.mastodon.entities.Filter;
import app.fedilab.android.client.mastodon.entities.IdentityProof;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.mastodon.entities.Preferences;
import app.fedilab.android.client.mastodon.entities.RelationShip;
import app.fedilab.android.client.mastodon.entities.Report;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.mastodon.entities.Tag;
import app.fedilab.android.client.mastodon.entities.Token;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.FeaturedTag;
import app.fedilab.android.client.entities.api.Filter;
import app.fedilab.android.client.entities.api.IdentityProof;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Preferences;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Report;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.client.entities.api.Token;
import okhttp3.MultipartBody;
import retrofit2.Call;
import retrofit2.http.Body;
@ -96,7 +96,7 @@ public interface MastodonAccountsService {
@Field("source[privacy]") String privacy,
@Field("source[sensitive]") Boolean sensitive,
@Field("source[language]") String language,
@Field("fields_attributes") List<app.fedilab.android.client.mastodon.entities.Field.FieldParams> fields
@Field("fields_attributes") List<app.fedilab.android.client.entities.api.Field.FieldParams> fields
);
//Get Account

6
app/src/main/java/app/fedilab/android/client/mastodon/MastodonAdminService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonAdminService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,8 +17,8 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.AdminAccount;
import app.fedilab.android.client.mastodon.entities.AdminReport;
import app.fedilab.android.client.entities.api.AdminAccount;
import app.fedilab.android.client.entities.api.AdminReport;
import retrofit2.Call;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;

4
app/src/main/java/app/fedilab/android/client/mastodon/MastodonAnnouncementsService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonAnnouncementsService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Announcement;
import app.fedilab.android.client.entities.api.Announcement;
import retrofit2.Call;
import retrofit2.http.DELETE;
import retrofit2.http.FormUrlEncoded;

6
app/src/main/java/app/fedilab/android/client/mastodon/MastodonAppsService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonAppsService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -15,8 +15,8 @@ package app.fedilab.android.client.mastodon;
* see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.mastodon.entities.App;
import app.fedilab.android.client.mastodon.entities.Token;
import app.fedilab.android.client.entities.api.App;
import app.fedilab.android.client.entities.api.Token;
import retrofit2.Call;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;

12
app/src/main/java/app/fedilab/android/client/mastodon/MastodonInstanceService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonInstanceService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,11 +17,11 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Activity;
import app.fedilab.android.client.mastodon.entities.Emoji;
import app.fedilab.android.client.mastodon.entities.Instance;
import app.fedilab.android.client.mastodon.entities.Tag;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Activity;
import app.fedilab.android.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.Instance;
import app.fedilab.android.client.entities.api.Tag;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Query;

6
app/src/main/java/app/fedilab/android/client/mastodon/MastodonNotificationsService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonNotificationsService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -16,8 +16,8 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Notification;
import app.fedilab.android.client.mastodon.entities.PushSubscription;
import app.fedilab.android.client.entities.api.Notification;
import app.fedilab.android.client.entities.api.PushSubscription;
import retrofit2.Call;
import retrofit2.http.DELETE;
import retrofit2.http.Field;

4
app/src/main/java/app/fedilab/android/client/mastodon/MastodonOembedService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonOembedService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -15,7 +15,7 @@ package app.fedilab.android.client.mastodon;
* see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.mastodon.entities.Oembed;
import app.fedilab.android.client.entities.api.Oembed;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Query;

4
app/src/main/java/app/fedilab/android/client/mastodon/MastodonSearchService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonSearchService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -15,7 +15,7 @@ package app.fedilab.android.client.mastodon;
* see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.mastodon.entities.Results;
import app.fedilab.android.client.entities.api.Results;
import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Header;

16
app/src/main/java/app/fedilab/android/client/mastodon/MastodonStatusesService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonStatusesService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -17,13 +17,13 @@ package app.fedilab.android.client.mastodon;
import java.util.Date;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.mastodon.entities.Card;
import app.fedilab.android.client.mastodon.entities.Context;
import app.fedilab.android.client.mastodon.entities.Poll;
import app.fedilab.android.client.mastodon.entities.ScheduledStatus;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Card;
import app.fedilab.android.client.entities.api.Context;
import app.fedilab.android.client.entities.api.Poll;
import app.fedilab.android.client.entities.api.ScheduledStatus;
import app.fedilab.android.client.entities.api.Status;
import okhttp3.MultipartBody;
import retrofit2.Call;
import retrofit2.http.DELETE;

12
app/src/main/java/app/fedilab/android/client/mastodon/MastodonTimelinesService.java → app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -16,11 +16,11 @@ package app.fedilab.android.client.mastodon;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Conversation;
import app.fedilab.android.client.mastodon.entities.Marker;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Conversation;
import app.fedilab.android.client.entities.api.Marker;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Status;
import retrofit2.Call;
import retrofit2.http.DELETE;
import retrofit2.http.Field;

2
app/src/main/java/app/fedilab/android/client/mastodon/ProgressRequestBody.java → app/src/main/java/app/fedilab/android/client/endpoints/ProgressRequestBody.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon;
package app.fedilab.android.client.endpoints;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Account.java → app/src/main/java/app/fedilab/android/client/entities/api/Account.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Accounts.java → app/src/main/java/app/fedilab/android/client/entities/api/Accounts.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Activity.java → app/src/main/java/app/fedilab/android/client/entities/api/Activity.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/AdminAccount.java → app/src/main/java/app/fedilab/android/client/entities/api/AdminAccount.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/AdminReport.java → app/src/main/java/app/fedilab/android/client/entities/api/AdminReport.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Announcement.java → app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/App.java → app/src/main/java/app/fedilab/android/client/entities/api/App.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Attachment.java → app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Card.java → app/src/main/java/app/fedilab/android/client/entities/api/Card.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Context.java → app/src/main/java/app/fedilab/android/client/entities/api/Context.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Conversation.java → app/src/main/java/app/fedilab/android/client/entities/api/Conversation.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Conversations.java → app/src/main/java/app/fedilab/android/client/entities/api/Conversations.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Emoji.java → app/src/main/java/app/fedilab/android/client/entities/api/Emoji.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/EmojiInstance.java → app/src/main/java/app/fedilab/android/client/entities/api/EmojiInstance.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Error.java → app/src/main/java/app/fedilab/android/client/entities/api/Error.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/FeaturedTag.java → app/src/main/java/app/fedilab/android/client/entities/api/FeaturedTag.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Field.java → app/src/main/java/app/fedilab/android/client/entities/api/Field.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Filter.java → app/src/main/java/app/fedilab/android/client/entities/api/Filter.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/History.java → app/src/main/java/app/fedilab/android/client/entities/api/History.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/IdentityProof.java → app/src/main/java/app/fedilab/android/client/entities/api/IdentityProof.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Instance.java → app/src/main/java/app/fedilab/android/client/entities/api/Instance.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/InstanceInfo.java → app/src/main/java/app/fedilab/android/client/entities/api/InstanceInfo.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/JoinMastodonInstance.java → app/src/main/java/app/fedilab/android/client/entities/api/JoinMastodonInstance.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Marker.java → app/src/main/java/app/fedilab/android/client/entities/api/Marker.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/MastodonList.java → app/src/main/java/app/fedilab/android/client/entities/api/MastodonList.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Mention.java → app/src/main/java/app/fedilab/android/client/entities/api/Mention.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Notification.java → app/src/main/java/app/fedilab/android/client/entities/api/Notification.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Notifications.java → app/src/main/java/app/fedilab/android/client/entities/api/Notifications.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Oembed.java → app/src/main/java/app/fedilab/android/client/entities/api/Oembed.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Pagination.java → app/src/main/java/app/fedilab/android/client/entities/api/Pagination.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Poll.java → app/src/main/java/app/fedilab/android/client/entities/api/Poll.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Preferences.java → app/src/main/java/app/fedilab/android/client/entities/api/Preferences.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/PushSubscription.java → app/src/main/java/app/fedilab/android/client/entities/api/PushSubscription.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Reaction.java → app/src/main/java/app/fedilab/android/client/entities/api/Reaction.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/RelationShip.java → app/src/main/java/app/fedilab/android/client/entities/api/RelationShip.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Report.java → app/src/main/java/app/fedilab/android/client/entities/api/Report.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Results.java → app/src/main/java/app/fedilab/android/client/entities/api/Results.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/ScheduledStatus.java → app/src/main/java/app/fedilab/android/client/entities/api/ScheduledStatus.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/ScheduledStatuses.java → app/src/main/java/app/fedilab/android/client/entities/api/ScheduledStatuses.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Source.java → app/src/main/java/app/fedilab/android/client/entities/api/Source.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Status.java → app/src/main/java/app/fedilab/android/client/entities/api/Status.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Statuses.java → app/src/main/java/app/fedilab/android/client/entities/api/Statuses.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Tag.java → app/src/main/java/app/fedilab/android/client/entities/api/Tag.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/mastodon/entities/Token.java → app/src/main/java/app/fedilab/android/client/entities/api/Token.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.mastodon.entities;
package app.fedilab.android.client.entities.api;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

14
app/src/main/java/app/fedilab/android/client/entities/Account.java → app/src/main/java/app/fedilab/android/client/entities/app/Account.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -64,7 +64,7 @@ public class Account implements Serializable {
@SerializedName("updated_at")
public Date updated_at;
@SerializedName("mastodon_account")
public app.fedilab.android.client.mastodon.entities.Account mastodon_account;
public app.fedilab.android.client.entities.api.Account mastodon_account;
private transient Context context;
@ -81,10 +81,10 @@ public class Account implements Serializable {
/**
* Serialized a Mastodon Account class
*
* @param mastodon_account {@link app.fedilab.android.client.mastodon.entities.Account} to serialize
* @param mastodon_account {@link app.fedilab.android.client.entities.api.Account} to serialize
* @return String serialized account
*/
public static String mastodonAccountToStringStorage(app.fedilab.android.client.mastodon.entities.Account mastodon_account) {
public static String mastodonAccountToStringStorage(app.fedilab.android.client.entities.api.Account mastodon_account) {
Gson gson = new Gson();
try {
return gson.toJson(mastodon_account);
@ -97,12 +97,12 @@ public class Account implements Serializable {
* Unserialized a Mastodon Account
*
* @param serializedAccount String serialized account
* @return {@link app.fedilab.android.client.mastodon.entities.Account}
* @return {@link app.fedilab.android.client.entities.api.Account}
*/
public static app.fedilab.android.client.mastodon.entities.Account restoreAccountFromString(String serializedAccount) {
public static app.fedilab.android.client.entities.api.Account restoreAccountFromString(String serializedAccount) {
Gson gson = new Gson();
try {
return gson.fromJson(serializedAccount, app.fedilab.android.client.mastodon.entities.Account.class);
return gson.fromJson(serializedAccount, app.fedilab.android.client.entities.api.Account.class);
} catch (Exception e) {
return null;
}

2
app/src/main/java/app/fedilab/android/client/entities/BottomMenu.java → app/src/main/java/app/fedilab/android/client/entities/app/BottomMenu.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/InstanceSocial.java → app/src/main/java/app/fedilab/android/client/entities/app/InstanceSocial.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

3
app/src/main/java/app/fedilab/android/client/entities/Pinned.java → app/src/main/java/app/fedilab/android/client/entities/app/Pinned.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab
@ -29,7 +29,6 @@ import java.util.Date;
import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.sqlite.Sqlite;

3
app/src/main/java/app/fedilab/android/client/entities/app/PinnedTimeline.java
View file

@ -18,8 +18,7 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.entities.api.MastodonList;
public class PinnedTimeline implements Serializable {

2
app/src/main/java/app/fedilab/android/client/entities/PostState.java → app/src/main/java/app/fedilab/android/client/entities/app/PostState.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab

4
app/src/main/java/app/fedilab/android/client/entities/QuickLoad.java → app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab
@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.MastodonHelper;
import app.fedilab.android.helper.SpannableHelper;

8
app/src/main/java/app/fedilab/android/client/entities/ScheduledBoost.java → app/src/main/java/app/fedilab/android/client/entities/app/ScheduledBoost.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2022 Thomas Schneider
*
* This file is a part of Fedilab
@ -14,8 +14,8 @@ package app.fedilab.android.client.entities;
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.client.entities.StatusCache.mastodonStatusToStringStorage;
import static app.fedilab.android.client.entities.StatusCache.restoreStatusFromString;
import static app.fedilab.android.client.entities.app.StatusCache.mastodonStatusToStringStorage;
import static app.fedilab.android.client.entities.app.StatusCache.restoreStatusFromString;
import android.content.ContentValues;
import android.content.Context;
@ -32,7 +32,7 @@ import java.util.List;
import java.util.UUID;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.sqlite.Sqlite;

8
app/src/main/java/app/fedilab/android/client/entities/StatusCache.java → app/src/main/java/app/fedilab/android/client/entities/app/StatusCache.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -26,9 +26,9 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Pagination;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.mastodon.entities.Statuses;
import app.fedilab.android.client.entities.api.Pagination;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Statuses;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.helper.MastodonHelper;

4
app/src/main/java/app/fedilab/android/client/entities/StatusDraft.java → app/src/main/java/app/fedilab/android/client/entities/app/StatusDraft.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab
@ -30,7 +30,7 @@ import java.util.List;
import java.util.UUID;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.sqlite.Sqlite;

2
app/src/main/java/app/fedilab/android/client/entities/Timeline.java → app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/WellKnownNodeinfo.java → app/src/main/java/app/fedilab/android/client/entities/app/WellKnownNodeinfo.java
View file

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities;
package app.fedilab.android.client.entities.app;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/helper/CommentDecorationHelper.java
View file

@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
public class CommentDecorationHelper {

34
app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java
View file

@ -36,10 +36,10 @@ import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.activities.ComposeActivity;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.mastodon.MastodonSearchService;
import app.fedilab.android.client.mastodon.entities.Results;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.endpoints.MastodonSearchService;
import app.fedilab.android.client.entities.api.Results;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.ui.drawer.AccountsSearchAdapter;
import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@ -63,7 +63,7 @@ public class CrossActionHelper {
* @param targetedAccount mastodon account that is targeted
* @param targetedStatus status that is targeted
*/
public static void doCrossAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
public static void doCrossAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
new Thread(() -> {
try {
@ -73,7 +73,7 @@ public class CrossActionHelper {
Runnable myRunnable = () -> fetchRemote(context, actionType, accounts.get(0), targetedAccount, targetedStatus);
mainHandler.post(myRunnable);
} else {
List<app.fedilab.android.client.mastodon.entities.Account> accountList = new ArrayList<>();
List<app.fedilab.android.client.entities.api.Account> accountList = new ArrayList<>();
for (Account account : accounts) {
accountList.add(account.mastodon_account);
}
@ -127,7 +127,7 @@ public class CrossActionHelper {
/**
* Fetch and federate the remote account or status
*/
private static void fetchRemote(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
private static void fetchRemote(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get("crossactions", SearchVM.class);
if (targetedAccount != null) {
@ -140,7 +140,7 @@ public class CrossActionHelper {
searchVM.search(ownerAccount.instance, ownerAccount.token, search, null, "accounts", false, true, false, 0, null, null, 1)
.observe((LifecycleOwner) context, results -> {
if (results.accounts != null && results.accounts.size() > 0) {
app.fedilab.android.client.mastodon.entities.Account account = results.accounts.get(0);
app.fedilab.android.client.entities.api.Account account = results.accounts.get(0);
applyAction(context, actionType, ownerAccount, account, null);
} else {
Toasty.info(context, context.getString(R.string.toast_error_search), Toasty.LENGTH_SHORT).show();
@ -165,7 +165,7 @@ public class CrossActionHelper {
/**
* Do action when status or account has been fetched
*/
private static void applyAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Status targetedStatus) {
private static void applyAction(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Status targetedStatus) {
AccountsVM accountsVM = null;
StatusesVM statusesVM = null;
@ -306,7 +306,7 @@ public class CrossActionHelper {
/**
* Fetch and federate the remote status
*/
public static void fetchRemoteAccount(@NonNull Context context, @NonNull Account ownerAccount, app.fedilab.android.client.mastodon.entities.Account targetedAccount, Callback callback) {
public static void fetchRemoteAccount(@NonNull Context context, @NonNull Account ownerAccount, app.fedilab.android.client.entities.api.Account targetedAccount, Callback callback) {
MastodonSearchService mastodonSearchService = init(context, MainActivity.currentInstance);
@ -354,13 +354,6 @@ public class CrossActionHelper {
}).start();
}
public interface Callback {
void federatedStatus(Status status);
void federatedAccount(app.fedilab.android.client.mastodon.entities.Account account);
}
public enum TypeOfCrossAction {
FOLLOW_ACTION,
UNFOLLOW_ACTION,
@ -376,4 +369,11 @@ public class CrossActionHelper {
UNREBLOG_ACTION,
REPLY_ACTION
}
public interface Callback {
void federatedStatus(Status status);
void federatedAccount(app.fedilab.android.client.entities.api.Account account);
}
}

2
app/src/main/java/app/fedilab/android/helper/DividerDecoration.java
View file

@ -31,7 +31,7 @@ import java.util.Arrays;
import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.ui.drawer.StatusAdapter;
public class DividerDecoration extends RecyclerView.ItemDecoration {

2
app/src/main/java/app/fedilab/android/helper/DividerDecorationSimple.java
View file

@ -29,7 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
import java.util.List;
import app.fedilab.android.R;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.ui.drawer.ComposeAdapter;
public class DividerDecorationSimple extends RecyclerView.ItemDecoration {

62
app/src/main/java/app/fedilab/android/helper/Helper.java
View file

@ -124,10 +124,10 @@ import app.fedilab.android.activities.LoginActivity;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.WebviewActivity;
import app.fedilab.android.broadcastreceiver.ToastMessage;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.QuickLoad;
import app.fedilab.android.client.entities.StatusCache;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.QuickLoad;
import app.fedilab.android.client.entities.app.StatusCache;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.sqlite.Sqlite;
import app.fedilab.android.viewmodel.mastodon.OauthVM;
@ -282,6 +282,11 @@ public class Helper {
"(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,10}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",
Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
// --- Static Map of patterns used in spannable status content
public static final Map<PatternType, Pattern> patternHashMap;
public static final int NOTIFICATION_MEDIA = 451;
public static final int NOTIFICATION_USER_NOTIF = 411;
public static final int NOTIFICATION_THEMING = 412;
/*
* List from ClearUrls
* https://gitlab.com/KevinRoebert/ClearUrls/blob/master/data/data.min.json#L106
@ -312,9 +317,6 @@ public class Helper {
"[\\?|&]ref[\\_]?"
};
// --- Static Map of patterns used in spannable status content
public static final Map<PatternType, Pattern> patternHashMap;
public static int counter = 1;
static {
@ -791,7 +793,6 @@ public class Helper {
return cleaned_content;
}
@SuppressLint("DefaultLocale")
public static String withSuffix(long count) {
if (count < 1000) return "" + count;
@ -1001,11 +1002,6 @@ public class Helper {
}
public static final int NOTIFICATION_MEDIA = 451;
public static final int NOTIFICATION_USER_NOTIF = 411;
public static final int NOTIFICATION_THEMING = 412;
/**
* Sends notification with intent
*
@ -1465,6 +1461,25 @@ public class Helper {
}
}
/**
* Send broadcast to recreate Mainactivity
*
* @param activity - Activity
*/
public static void recreateMainActivity(Activity activity) {
Bundle b = new Bundle();
b.putBoolean(Helper.RECEIVE_RECREATE_ACTIVITY, true);
Intent intentBD = new Intent(Helper.BROADCAST_DATA);
intentBD.putExtras(b);
LocalBroadcastManager.getInstance(activity).sendBroadcast(intentBD);
}
public static void showKeyboard(Context context, View view) {
view.requestFocus();
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
}
//Enum that described actions to replace inside a toot content
public enum PatternType {
MENTION,
@ -1485,6 +1500,7 @@ public class Helper {
TOOT
}
public interface OnAttachmentCopied {
void onAttachmentCopied(Attachment attachment);
}
@ -1549,24 +1565,4 @@ public class Helper {
}).start();
}
}
/**
* Send broadcast to recreate Mainactivity
*
* @param activity - Activity
*/
public static void recreateMainActivity(Activity activity) {
Bundle b = new Bundle();
b.putBoolean(Helper.RECEIVE_RECREATE_ACTIVITY, true);
Intent intentBD = new Intent(Helper.BROADCAST_DATA);
intentBD.putExtras(b);
LocalBroadcastManager.getInstance(activity).sendBroadcast(intentBD);
}
public static void showKeyboard(Context context, View view) {
view.requestFocus();
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
}
}

14
app/src/main/java/app/fedilab/android/helper/MastodonHelper.java
View file

@ -49,11 +49,11 @@ import java.util.regex.Pattern;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.ScheduledBoost;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Pagination;
import app.fedilab.android.client.mastodon.entities.RelationShip;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Pagination;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.ScheduledBoost;
import app.fedilab.android.databinding.DatetimePickerBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.jobs.ScheduleBoostWorker;
@ -191,11 +191,11 @@ public class MastodonHelper {
return pagination;
}
*/
public static void loadPPMastodon(ImageView view, app.fedilab.android.client.mastodon.entities.Account account) {
public static void loadPPMastodon(ImageView view, Account account) {
loadProfileMediaMastodon(view, account, MediaAccountType.AVATAR);
}
public static void loadProfileMediaMastodon(ImageView view, app.fedilab.android.client.mastodon.entities.Account account, MediaAccountType type) {
public static void loadProfileMediaMastodon(ImageView view, Account account, MediaAccountType type) {
Context context = view.getContext();
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
boolean disableGif = sharedpreferences.getBoolean(context.getString(R.string.SET_DISABLE_GIF), false);

8
app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java
View file

@ -49,10 +49,10 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.mastodon.MastodonNotificationsService;
import app.fedilab.android.client.mastodon.entities.Notification;
import app.fedilab.android.client.mastodon.entities.Notifications;
import app.fedilab.android.client.endpoints.MastodonNotificationsService;
import app.fedilab.android.client.entities.api.Notification;
import app.fedilab.android.client.entities.api.Notifications;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.exception.DBException;
import okhttp3.OkHttpClient;
import retrofit2.Call;

8
app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
View file

@ -43,13 +43,13 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.BottomMenu;
import app.fedilab.android.client.entities.Pinned;
import app.fedilab.android.client.entities.Timeline;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.app.BottomMenu;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.RemoteInstance;
import app.fedilab.android.client.entities.app.TagTimeline;
import app.fedilab.android.client.mastodon.entities.MastodonList;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityMainBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;

2
app/src/main/java/app/fedilab/android/helper/PushHelper.java
View file

@ -37,7 +37,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.jobs.NotificationsWorker;
public class PushHelper {

6
app/src/main/java/app/fedilab/android/helper/PushNotifications.java
View file

@ -32,9 +32,9 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R;
import app.fedilab.android.client.entities.Account;
import app.fedilab.android.client.mastodon.MastodonNotificationsService;
import app.fedilab.android.client.mastodon.entities.PushSubscription;
import app.fedilab.android.client.endpoints.MastodonNotificationsService;
import app.fedilab.android.client.entities.api.PushSubscription;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.exception.DBException;
import okhttp3.OkHttpClient;
import retrofit2.Call;

14
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View file

@ -75,13 +75,13 @@ import app.fedilab.android.activities.ContextActivity;
import app.fedilab.android.activities.HashTagActivity;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.ProfileActivity;
import app.fedilab.android.client.mastodon.entities.Account;
import app.fedilab.android.client.mastodon.entities.Attachment;
import app.fedilab.android.client.mastodon.entities.Emoji;
import app.fedilab.android.client.mastodon.entities.Field;
import app.fedilab.android.client.mastodon.entities.Mention;
import app.fedilab.android.client.mastodon.entities.Poll;
import app.fedilab.android.client.mastodon.entities.Status;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.Field;
import app.fedilab.android.client.entities.api.Mention;
import app.fedilab.android.client.entities.api.Poll;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.PopupLinksBinding;
import es.dmoral.toasty.Toasty;

Some files were not shown because too many files have changed in this diff Show more