Commit Diff
--- mastodon/src/main/java/org/joinmastodon/android/fragments/SplashFragment.java +++ /dev/null @@ -1,321 +0,0 @@ -package org.joinmastodon.android.fragments; - -import android.app.ProgressDialog; -import android.content.ClipData; -import android.content.ClipboardManager; -import android.graphics.drawable.ColorDrawable; -import android.net.Uri; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.view.WindowInsets; -import android.widget.ProgressBar; - -import org.joinmastodon.android.MastodonApp; -import org.joinmastodon.android.R; -import org.joinmastodon.android.api.MastodonErrorResponse; -import org.joinmastodon.android.api.requests.accounts.CheckInviteLink; -import org.joinmastodon.android.api.requests.catalog.GetCatalogDefaultInstances; -import org.joinmastodon.android.api.requests.instance.GetInstance; -import org.joinmastodon.android.fragments.onboarding.InstanceCatalogSignupFragment; -import org.joinmastodon.android.fragments.onboarding.InstanceChooserLoginFragment; -import org.joinmastodon.android.fragments.onboarding.InstanceRulesFragment; -import org.joinmastodon.android.model.Instance; -import org.joinmastodon.android.model.catalog.CatalogDefaultInstance; -import org.joinmastodon.android.ui.InterpolatingMotionEffect; -import org.joinmastodon.android.ui.M3AlertDialogBuilder; -import org.joinmastodon.android.ui.text.HtmlParser; -import org.joinmastodon.android.ui.utils.UiUtils; -import org.joinmastodon.android.ui.views.ProgressBarButton; -import org.joinmastodon.android.ui.views.SizeListenerFrameLayout; -import org.parceler.Parcels; - -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; - -import androidx.annotation.Nullable; -import me.grishka.appkit.Nav; -import me.grishka.appkit.api.Callback; -import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.fragments.AppKitFragment; -import me.grishka.appkit.utils.V; -import me.grishka.appkit.views.BottomSheet; - -public class SplashFragment extends AppKitFragment{ - - private static final String DEFAULT_SERVER="mastodon.social"; - - private SizeListenerFrameLayout contentView; - private View artContainer, blueFill, greenFill; - private InterpolatingMotionEffect motionEffect; - private View artClouds, artPlaneElephant, artRightHill, artLeftHill, artCenterHill; - private ProgressBarButton defaultServerButton; - private ProgressBar defaultServerProgress; - private String chosenDefaultServer=DEFAULT_SERVER; - private boolean loadingDefaultServer, loadedDefaultServer; - private Uri currentInviteLink; - private ProgressDialog instanceLoadingProgress; - private String inviteCode; - - @Override - public void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - motionEffect=new InterpolatingMotionEffect(MastodonApp.context); - } - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){ - contentView=(SizeListenerFrameLayout) inflater.inflate(R.layout.fragment_splash, container, false); - contentView.findViewById(R.id.btn_get_started).setOnClickListener(this::onButtonClick); - contentView.findViewById(R.id.btn_log_in).setOnClickListener(this::onButtonClick); - defaultServerButton=contentView.findViewById(R.id.btn_join_default_server); - defaultServerButton.setText(getString(R.string.join_default_server, chosenDefaultServer)); - defaultServerButton.setOnClickListener(this::onJoinDefaultServerClick); - defaultServerProgress=contentView.findViewById(R.id.action_progress); - if(loadingDefaultServer){ - defaultServerButton.setTextVisible(false); - defaultServerProgress.setVisibility(View.VISIBLE); - } - contentView.findViewById(R.id.btn_learn_more).setOnClickListener(this::onLearnMoreClick); - - artClouds=contentView.findViewById(R.id.art_clouds); - artPlaneElephant=contentView.findViewById(R.id.art_plane_elephant); - artRightHill=contentView.findViewById(R.id.art_right_hill); - artLeftHill=contentView.findViewById(R.id.art_left_hill); - artCenterHill=contentView.findViewById(R.id.art_center_hill); - - artContainer=contentView.findViewById(R.id.art_container); - blueFill=contentView.findViewById(R.id.blue_fill); - greenFill=contentView.findViewById(R.id.green_fill); - motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artClouds, V.dp(-5), V.dp(5), V.dp(-5), V.dp(5))); - motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artRightHill, V.dp(-15), V.dp(25), V.dp(-10), V.dp(10))); - motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artLeftHill, V.dp(-25), V.dp(15), V.dp(-15), V.dp(15))); - motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artCenterHill, V.dp(-14), V.dp(14), V.dp(-5), V.dp(25))); - motionEffect.addViewEffect(new InterpolatingMotionEffect.ViewEffect(artPlaneElephant, V.dp(-20), V.dp(12), V.dp(-20), V.dp(12))); - artContainer.setOnTouchListener(motionEffect); - - contentView.setSizeListener(new SizeListenerFrameLayout.OnSizeChangedListener(){ - @Override - public void onSizeChanged(int w, int h, int oldw, int oldh){ - contentView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){ - @Override - public boolean onPreDraw(){ - contentView.getViewTreeObserver().removeOnPreDrawListener(this); - updateArtSize(w, h); - return true; - } - }); - } - }); - if(!loadedDefaultServer && !loadingDefaultServer) - loadAndChooseDefaultServer(); - - return contentView; - } - - private void onButtonClick(View v){ - Bundle extras=new Bundle(); - boolean isSignup=v.getId()==R.id.btn_get_started; - extras.putBoolean("signup", isSignup); - extras.putString("defaultServer", chosenDefaultServer); - Nav.go(getActivity(), isSignup ? InstanceCatalogSignupFragment.class : InstanceChooserLoginFragment.class, extras); - } - - private void onJoinDefaultServerClick(View v){ - if(loadingDefaultServer) - return; - instanceLoadingProgress=new ProgressDialog(getActivity()); - instanceLoadingProgress.setCancelable(false); - instanceLoadingProgress.setMessage(getString(R.string.loading_instance)); - instanceLoadingProgress.show(); - if(currentInviteLink!=null){ - new CheckInviteLink(currentInviteLink.getPath()) - .setCallback(new Callback<>(){ - @Override - public void onSuccess(CheckInviteLink.Response result){ - inviteCode=result.inviteCode; - proceedWithServerDomain(currentInviteLink.getHost()); - } - - @Override - public void onError(ErrorResponse error){ - if(getActivity()==null) - return; - instanceLoadingProgress.dismiss(); - instanceLoadingProgress=null; - if(error instanceof MastodonErrorResponse mer){ - switch(mer.httpStatus){ - case 401 -> new M3AlertDialogBuilder(getActivity()) - .setTitle(R.string.expired_invite_link) - .setMessage(getString(R.string.expired_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer)) - .setPositiveButton(R.string.ok, null) - .show(); - case 404 -> new M3AlertDialogBuilder(getActivity()) - .setTitle(R.string.invalid_invite_link) - .setMessage(getString(R.string.invalid_clipboard_invite_link_alert, currentInviteLink.getHost(), chosenDefaultServer)) - .setPositiveButton(R.string.ok, null) - .show(); - default -> error.showToast(getActivity()); - } - } - } - }) - .execNoAuth(currentInviteLink.getHost()); - return; - } - proceedWithServerDomain(chosenDefaultServer); - } - - private void proceedWithServerDomain(String domain){ - new GetInstance() - .setCallback(new Callback<>(){ - @Override - public void onSuccess(Instance result){ - if(getActivity()==null) - return; - instanceLoadingProgress.dismiss(); - instanceLoadingProgress=null; - if(!result.registrations && TextUtils.isEmpty(inviteCode)){ - new M3AlertDialogBuilder(getActivity()) - .setTitle(R.string.error) - .setMessage(R.string.instance_signup_closed) - .setPositiveButton(R.string.ok, null) - .show(); - return; - } - Bundle args=new Bundle(); - args.putParcelable("instance", Parcels.wrap(result)); - if(inviteCode!=null) - args.putString("inviteCode", inviteCode); - Nav.go(getActivity(), InstanceRulesFragment.class, args); - } - - @Override - public void onError(ErrorResponse error){ - if(getActivity()==null) - return; - instanceLoadingProgress.dismiss(); - instanceLoadingProgress=null; - error.showToast(getActivity()); - } - }) - .execNoAuth(domain); - } - - private void onLearnMoreClick(View v){ - View sheetView=getActivity().getLayoutInflater().inflate(R.layout.intro_bottom_sheet, null); - BottomSheet sheet=new BottomSheet(getActivity()); - sheet.setContentView(sheetView); - sheet.setNavigationBarBackground(new ColorDrawable(UiUtils.alphaBlendColors(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Surface), - UiUtils.getThemeColor(getActivity(), R.attr.colorM3Primary), 0.05f)), !UiUtils.isDarkTheme()); - sheet.show(); - } - - private void updateArtSize(int w, int h){ - float scale=w/(float)V.dp(360); - artContainer.setScaleX(scale); - artContainer.setScaleY(scale); - blueFill.setScaleY(artContainer.getBottom()-V.dp(90)); - greenFill.setScaleY(h-artContainer.getBottom()+V.dp(90)); - } - - - @Override - public void onApplyWindowInsets(WindowInsets insets){ - super.onApplyWindowInsets(insets); - int bottomInset=insets.getSystemWindowInsetBottom(); - if(bottomInset>0 && bottomInset<V.dp(36)){ - contentView.setPadding(contentView.getPaddingLeft(), contentView.getPaddingTop(), contentView.getPaddingRight(), V.dp(36)); - } - ((ViewGroup.MarginLayoutParams)blueFill.getLayoutParams()).topMargin=-contentView.getPaddingTop(); - ((ViewGroup.MarginLayoutParams)greenFill.getLayoutParams()).bottomMargin=-contentView.getPaddingBottom(); - } - - @Override - public boolean wantsLightStatusBar(){ - return true; - } - - @Override - public boolean wantsLightNavigationBar(){ - return true; - } - - @Override - protected void onShown(){ - super.onShown(); - motionEffect.activate(); - } - - @Override - protected void onHidden(){ - super.onHidden(); - motionEffect.deactivate(); - } - - private void loadAndChooseDefaultServer(){ - ClipData clipData=getActivity().getSystemService(ClipboardManager.class).getPrimaryClip(); - if(clipData!=null && clipData.getItemCount()>0){ - CharSequence clipText=clipData.getItemAt(0).coerceToText(getActivity()); - if(HtmlParser.INVITE_LINK_PATTERN.matcher(clipText).find()){ - currentInviteLink=Uri.parse(clipText.toString()); - defaultServerButton.setText(getString(R.string.join_server_x_with_invite, currentInviteLink.getHost())); - } - }else{ - loadingDefaultServer=true; - defaultServerButton.setTextVisible(false); - defaultServerProgress.setVisibility(View.VISIBLE); - } - new GetCatalogDefaultInstances() - .setCallback(new Callback<>(){ - @Override - public void onSuccess(List<CatalogDefaultInstance> result){ - if(result.isEmpty()){ - setChosenDefaultServer(DEFAULT_SERVER); - return; - } - float sum=0f; - for(CatalogDefaultInstance inst:result){ - sum+=inst.weight; - } - if(sum<=0) - sum=1f; - for(CatalogDefaultInstance inst:result){ - inst.weight/=sum; - } - float rand=ThreadLocalRandom.current().nextFloat(); - float prev=0f; - for(CatalogDefaultInstance inst:result){ - if(rand>=prev && rand<prev+inst.weight){ - setChosenDefaultServer(inst.domain); - return; - } - prev+=inst.weight; - } - // Just in case something didn't add up - setChosenDefaultServer(result.get(result.size()-1).domain); - } - - @Override - public void onError(ErrorResponse error){ - setChosenDefaultServer(DEFAULT_SERVER); - } - }) - .execNoAuth(""); - } - - private void setChosenDefaultServer(String domain){ - chosenDefaultServer=domain; - loadingDefaultServer=false; - loadedDefaultServer=true; - if(defaultServerButton!=null && getActivity()!=null && currentInviteLink==null){ - defaultServerButton.setTextVisible(true); - defaultServerProgress.setVisibility(View.GONE); - defaultServerButton.setText(getString(R.string.join_default_server, chosenDefaultServer)); - } - } -} --- mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java +++ mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java @@ -24,7 +24,6 @@ import org.joinmastodon.android.api.requests.oauth.Rev import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.HomeFragment; -import org.joinmastodon.android.fragments.SplashFragment; import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment; import org.joinmastodon.android.ui.ClickableSingleViewRecyclerAdapter; import org.joinmastodon.android.ui.M3AlertDialogBuilder; @@ -119,8 +118,6 @@ public class AccountSwitcherSheet extends BottomSheet{ Nav.go(activity, CustomWelcomeFragment.class, null); dismiss(); })); - // disabled in megalodon -// adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(makeSimpleListItem(R.string.log_out_all_accounts, R.drawable.ic_fluent_person_arrow_right_24_filled), this::confirmLogOutAll)); } list.setAdapter(adapter); @@ -152,14 +149,6 @@ public class AccountSwitcherSheet extends BottomSheet{ .show(); } - private void confirmLogOutAll(){ - new M3AlertDialogBuilder(activity) - .setMessage(R.string.confirm_log_out_all_accounts) - .setPositiveButton(R.string.log_out, (dialog, which) -> logOutAll()) - .setNegativeButton(R.string.cancel, null) - .show(); - } - private void logOut(String accountID){ String activeAccount=AccountSessionManager.getInstance().getLastActiveAccountID(); AccountSessionManager.get(accountID).logOut(activity, ()->{ @@ -170,61 +159,6 @@ public class AccountSwitcherSheet extends BottomSheet{ }); } - private void logOutAll(){ - final ProgressDialog progress=new ProgressDialog(activity); - progress.setMessage(activity.getString(R.string.loading)); - progress.setCancelable(false); - progress.show(); - ArrayList<AccountSession> sessions=new ArrayList<>(AccountSessionManager.getInstance().getLoggedInAccounts()); - for(AccountSession session:sessions){ - new RevokeOauthToken(session.app.clientId, session.app.clientSecret, session.token.accessToken) - .setCallback(new Callback<>(){ - @Override - public void onSuccess(Object result){ - AccountSessionManager.getInstance().removeAccount(session.getID()); - sessions.remove(session); - if(sessions.isEmpty()){ - if(onLoggedOutCallback!=null) - onLoggedOutCallback.run(); - progress.dismiss(); - Nav.goClearingStack(activity, SplashFragment.class, null); - dismiss(); - } - } - - @Override - public void onError(ErrorResponse error){ - AccountSessionManager.getInstance().removeAccount(session.getID()); - sessions.remove(session); - if(sessions.isEmpty()){ - if(onLoggedOutCallback!=null) - onLoggedOutCallback.run(); - progress.dismiss(); - Nav.goClearingStack(activity, SplashFragment.class, null); - dismiss(); - } - } - }) - .exec(session.getID()); - } - } - - private void onLoggedOut(String accountID){ - AccountSessionManager.getInstance().removeAccount(accountID); - String activeAccountID = fragment != null - ? fragment.getAccountID() - : AccountSessionManager.getInstance().getLastActiveAccountID(); - if (accountID.equals(activeAccountID)) { - activity.finish(); - activity.startActivity(new Intent(activity, MainActivity.class)); - } else { - accounts.stream().filter(w -> accountID.equals(w.session.getID())).findAny().ifPresent(w -> { - accountsAdapter.notifyItemRemoved(accounts.indexOf(w)); - accounts.remove(w); - }); - } - } - @Override protected void onWindowInsetsUpdated(WindowInsets insets){ if(Build.VERSION.SDK_INT>=29){ --- mastodon/src/main/res/layout/fragment_splash.xml +++ /dev/null @@ -1,215 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<org.joinmastodon.android.ui.views.SizeListenerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true" - android:clipToPadding="false" - android:theme="@style/Theme.Mastodon.Dark.SplashFragment"> - - <View - android:id="@+id/blue_fill" - android:layout_width="match_parent" - android:layout_height="1px" - android:layout_gravity="top" - android:transformPivotY="0px" - android:background="#50D5ED"/> - - <FrameLayout - android:id="@+id/art_container" - android:layout_width="360dp" - android:layout_height="640dp" - android:layout_gravity="center" - tools:ignore="rtlHardcoded"> - - <ImageView - android:id="@+id/art_clouds" - android:layout_width="414dp" - android:layout_height="541dp" - android:layout_marginTop="37dp" - android:layout_marginLeft="-27dp" - android:layout_gravity="top|left" - android:alpha="0.3" - android:importantForAccessibility="no" - android:src="@drawable/splash_art_layer0"/> - - <ImageView - android:id="@+id/art_plane_elephant" - android:layout_width="245.64dp" - android:layout_height="72.65dp" - android:layout_marginLeft="-50.775dp" - android:layout_marginTop="184.12dp" - android:layout_gravity="left|top" - android:alpha="0.3" - android:importantForAccessibility="no" - android:src="@drawable/splash_art_layer4"/> - - <ImageView - android:id="@+id/art_right_hill" - android:layout_width="150.84dp" - android:layout_height="176.44dp" - android:layout_gravity="top|left" - android:layout_marginLeft="278dp" - android:layout_marginTop="244dp" - android:importantForAccessibility="no" - android:src="@drawable/splash_art_layer1"/> - - <ImageView - android:id="@+id/art_left_hill" - android:layout_width="197.2dp" - android:layout_height="153.61dp" - android:layout_gravity="top|left" - android:layout_marginTop="252dp" - android:layout_marginLeft="-44dp" - android:importantForAccessibility="no" - android:src="@drawable/splash_art_layer2"/> - - <ImageView - android:id="@+id/art_center_hill" - android:layout_width="400dp" - android:layout_height="346dp" - android:layout_gravity="top|left" - android:layout_marginTop="240dp" - android:layout_marginLeft="-20dp" - android:importantForAccessibility="no" - android:src="@drawable/splash_art_layer3"/> - - </FrameLayout> - - <View - android:id="@+id/green_fill" - android:layout_width="match_parent" - android:layout_height="1px" - android:layout_gravity="bottom" - android:transformPivotY="1px" - android:background="#478E6A"/> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:orientation="vertical"> - -<!-- <ImageView--> -<!-- android:layout_width="300dp"--> -<!-- android:layout_height="78dp"--> -<!-- android:layout_gravity="center_horizontal"--> -<!-- android:layout_marginTop="32dp"--> -<!-- android:importantForAccessibility="no"--> -<!-- android:src="@drawable/splash_logo"/>--> - - <Space - android:layout_width="1px" - android:layout_height="0px" - android:layout_weight="1"/> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <org.joinmastodon.android.ui.views.ProgressBarButton - android:id="@+id/btn_join_default_server" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - style="@style/Widget.Mastodon.M3.Button.Filled" - tools:text="@string/join_default_server"/> - - <ProgressBar - android:id="@+id/action_progress" - style="?android:progressBarStyleSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:elevation="10dp" - android:indeterminate="true" - android:outlineProvider="none" - android:indeterminateTint="#FFF" - android:visibility="gone" /> - - </FrameLayout> - - <Button - android:id="@+id/btn_get_started" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginTop="8dp" - android:textColor="#FFF" - style="@style/Widget.Mastodon.M3.Button.Outlined" - android:background="@drawable/bg_button_m3_outlined_white" - android:text="@string/pick_server"/> - - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginTop="8dp" - android:orientation="horizontal"> - - <View - android:layout_width="0dp" - android:layout_height="1dp" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:background="#B2FFFFFF"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="20dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:textAllCaps="true" - android:textAppearance="@style/m3_label_large" - android:textColor="#B2FFFFFF" - android:layout_gravity="center_vertical" - android:text="@string/signup_or_login"/> - - <View - android:layout_width="0dp" - android:layout_height="1dp" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:background="#B2FFFFFF"/> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp"> - - <Button - android:id="@+id/btn_learn_more" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:layout_weight="1" - android:textColor="#FFF" - style="@style/Widget.Mastodon.M3.Button.Text" - android:background="@drawable/bg_button_m3_text_white" - android:text="@string/learn_more"/> - - <Button - android:id="@+id/btn_log_in" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:layout_weight="1" - android:textColor="#FFF" - style="@style/Widget.Mastodon.M3.Button.Text" - android:background="@drawable/bg_button_m3_text_white" - android:text="@string/log_in"/> - - </LinearLayout> - - </LinearLayout> - -</org.joinmastodon.android.ui.views.SizeListenerFrameLayout> \ No newline at end of file