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

Its closer to working

Browse Source
This commit is contained in:
LucasGGamerM
2023-01-03 15:18:34 -03:00
parent 1cdcc8794c
commit b69015a25a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
View File

@@ -208,6 +208,9 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
} }
getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit(); getChildFragmentManager().beginTransaction().hide(fragmentForTab(currentTab)).show(newFragment).commit();
maybeTriggerLoading(newFragment); maybeTriggerLoading(newFragment);
// if(tab == currentTab && tab == R.id.tab_search){
// searchFragment.selectSearch();
// }
currentTab=tab; currentTab=tab;
((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this); ((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this);
} }
@@ -236,8 +239,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
return true; return true;
} }
if(tab==R.id.tab_search){ if(tab==R.id.tab_search){
searchFragment.selectSearch(true); searchFragment.selectSearch();
onTabSelected(tab); onTabSelected(R.id.tab_search);
} }
return false; return false;

8
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
View File

@@ -19,6 +19,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import org.joinmastodon.android.BuildConfig; import org.joinmastodon.android.BuildConfig;
import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.GlobalUserPreferences;
@@ -48,7 +49,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
private TabLayoutMediator tabLayoutMediator; private TabLayoutMediator tabLayoutMediator;
private EditText searchEdit; private EditText searchEdit;
private boolean searchActive; private boolean searchActive;
public boolean wasTriggeredByLongPress = false;
private FrameLayout searchView; private FrameLayout searchView;
private ImageButton searchBack, searchClear; private ImageButton searchBack, searchClear;
private ProgressBar searchProgress; private ProgressBar searchProgress;
@@ -362,11 +362,9 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
} }
} }
public void selectSearch(boolean selectSearch){ public void selectSearch(){
wasTriggeredByLongPress=selectSearch;
searchEdit.requestFocus(); searchEdit.requestFocus();
onSearchEditFocusChanged(searchEdit, selectSearch); onSearchEditFocusChanged(searchEdit, true);
getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0); getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
} }
} }