fix crashes in landscape mode
This commit is contained in:
@ -128,51 +128,14 @@ public class TunnelsContainer extends Fragment implements
|
|||||||
@Override
|
@Override
|
||||||
public void onActivityCreated(Bundle savedInstanceState) {
|
public void onActivityCreated(Bundle savedInstanceState) {
|
||||||
super.onActivityCreated(savedInstanceState);
|
super.onActivityCreated(savedInstanceState);
|
||||||
// Add null check for safety
|
|
||||||
if (mPageIndicator == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Initialize ViewPager and adapter
|
||||||
mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
|
mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
|
||||||
mViewPager.setAdapter(mFragPagerAdapter);
|
mViewPager.setAdapter(mFragPagerAdapter);
|
||||||
|
|
||||||
// Replace old indicator setup with MagicIndicator initialization
|
setupMagicIndicator();
|
||||||
CommonNavigator commonNavigator = new CommonNavigator(getContext());
|
|
||||||
commonNavigator.setAdapter(new CommonNavigatorAdapter() {
|
|
||||||
@Override
|
|
||||||
public int getCount() {
|
|
||||||
return mFragPagerAdapter.getCount();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IPagerTitleView getTitleView(Context context, final int index) {
|
|
||||||
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
|
|
||||||
simplePagerTitleView.setText(mFragPagerAdapter.getPageTitle(index));
|
|
||||||
simplePagerTitleView.setNormalColor(ContextCompat.getColor(context,
|
|
||||||
R.color.primary_text_disabled_material_dark));
|
|
||||||
simplePagerTitleView.setSelectedColor(ContextCompat.getColor(context,
|
|
||||||
R.color.primary_text_default_material_dark));
|
|
||||||
simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
mViewPager.setCurrentItem(index);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return simplePagerTitleView;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public IPagerIndicator getIndicator(Context context) {
|
|
||||||
LinePagerIndicator indicator = new LinePagerIndicator(context);
|
|
||||||
indicator.setColors(ContextCompat.getColor(context, R.color.primary));
|
|
||||||
return indicator;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
mPageIndicator.setNavigator(commonNavigator);
|
|
||||||
ViewPagerHelper.bind(mPageIndicator, mViewPager);
|
|
||||||
//mPageIndicator.setViewPager(mViewPager);
|
|
||||||
|
|
||||||
|
// Setup New Tunnel button
|
||||||
mNewTunnel.setOnClickListener(new View.OnClickListener() {
|
mNewTunnel.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
@ -378,6 +341,7 @@ public class TunnelsContainer extends Fragment implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
CommonNavigator commonNavigator = new CommonNavigator(getContext());
|
CommonNavigator commonNavigator = new CommonNavigator(getContext());
|
||||||
|
commonNavigator.setAdjustMode(true); // Add this line for better spacing
|
||||||
commonNavigator.setAdapter(new CommonNavigatorAdapter() {
|
commonNavigator.setAdapter(new CommonNavigatorAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public int getCount() {
|
public int getCount() {
|
||||||
@ -388,6 +352,7 @@ public class TunnelsContainer extends Fragment implements
|
|||||||
public IPagerTitleView getTitleView(Context context, final int index) {
|
public IPagerTitleView getTitleView(Context context, final int index) {
|
||||||
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
|
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
|
||||||
simplePagerTitleView.setText(mFragPagerAdapter.getPageTitle(index));
|
simplePagerTitleView.setText(mFragPagerAdapter.getPageTitle(index));
|
||||||
|
simplePagerTitleView.setTextSize(16); // Add this line to increase text size
|
||||||
simplePagerTitleView.setNormalColor(ContextCompat.getColor(context,
|
simplePagerTitleView.setNormalColor(ContextCompat.getColor(context,
|
||||||
R.color.primary_text_disabled_material_dark));
|
R.color.primary_text_disabled_material_dark));
|
||||||
simplePagerTitleView.setSelectedColor(ContextCompat.getColor(context,
|
simplePagerTitleView.setSelectedColor(ContextCompat.getColor(context,
|
||||||
@ -404,7 +369,9 @@ public class TunnelsContainer extends Fragment implements
|
|||||||
@Override
|
@Override
|
||||||
public IPagerIndicator getIndicator(Context context) {
|
public IPagerIndicator getIndicator(Context context) {
|
||||||
LinePagerIndicator indicator = new LinePagerIndicator(context);
|
LinePagerIndicator indicator = new LinePagerIndicator(context);
|
||||||
|
indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
|
||||||
indicator.setColors(ContextCompat.getColor(context, R.color.primary));
|
indicator.setColors(ContextCompat.getColor(context, R.color.primary));
|
||||||
|
indicator.setLineHeight(dpToPx(context, 3));
|
||||||
return indicator;
|
return indicator;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -412,4 +379,9 @@ public class TunnelsContainer extends Fragment implements
|
|||||||
mPageIndicator.setNavigator(commonNavigator);
|
mPageIndicator.setNavigator(commonNavigator);
|
||||||
ViewPagerHelper.bind(mPageIndicator, mViewPager);
|
ViewPagerHelper.bind(mPageIndicator, mViewPager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int dpToPx(Context context, int dp) {
|
||||||
|
float density = context.getResources().getDisplayMetrics().density;
|
||||||
|
return Math.round(dp * density);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<android.support.v7.widget.Toolbar
|
<androidx.appcompat.widget.Toolbar
|
||||||
android:id="@+id/main_toolbar"
|
android:id="@+id/main_toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="?attr/actionBarSize"
|
android:layout_height="?attr/actionBarSize"
|
||||||
@ -18,7 +18,7 @@
|
|||||||
android:id="@+id/sliding_tabs"
|
android:id="@+id/sliding_tabs"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</android.support.v7.widget.Toolbar>
|
</androidx.appcompat.widget.Toolbar>
|
||||||
|
|
||||||
<net.i2p.android.widget.DrawShadowFrameLayout
|
<net.i2p.android.widget.DrawShadowFrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@ -27,7 +27,7 @@
|
|||||||
android:clipChildren="false"
|
android:clipChildren="false"
|
||||||
app:shadowDrawable="@drawable/header_shadow">
|
app:shadowDrawable="@drawable/header_shadow">
|
||||||
|
|
||||||
<android.support.v4.view.CustomViewPager
|
<androidx.viewpager.widget.CustomViewPager
|
||||||
android:id="@+id/pager"
|
android:id="@+id/pager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent" />
|
android:layout_height="match_parent" />
|
||||||
|
@ -72,7 +72,7 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<android.support.v7.widget.Toolbar
|
<androidx.appcompat.widget.Toolbar
|
||||||
android:id="@+id/console_bottom_toolbar"
|
android:id="@+id/console_bottom_toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="56dp"
|
android:layout_height="56dp"
|
||||||
@ -130,7 +130,7 @@
|
|||||||
tools:text="0.0 KBps / 0.0 KB" />
|
tools:text="0.0 KBps / 0.0 KB" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</android.support.v7.widget.Toolbar>
|
</androidx.appcompat.widget.Toolbar>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
|
Reference in New Issue
Block a user