diff --git a/app/src/main/java/lu/fisch/canze/changelog.txt b/app/src/main/java/lu/fisch/canze/changelog.txt
index 49e6e0fd..ea67b015 100644
--- a/app/src/main/java/lu/fisch/canze/changelog.txt
+++ b/app/src/main/java/lu/fisch/canze/changelog.txt
@@ -1,3 +1,4 @@
+2019-11-24 [Jeroen] Code cleanup in fragment handling
2019-11-24 [Jeroen] Updated .gitignore to exclude some .idea and backup stuff
2019-11-23 [Jeroen] Full refactor of Tyre to Tire
2019-11-23 [Jeroen] Several fixes Tyres, changelog
diff --git a/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java b/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java
index dc6bb9c7..d8f6e9e8 100644
--- a/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java
+++ b/app/src/main/java/lu/fisch/canze/fragments/ExperimentalFragment.java
@@ -24,22 +24,21 @@
import android.content.Intent;
import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
import lu.fisch.canze.BuildConfig;
import lu.fisch.canze.R;
import lu.fisch.canze.activities.DashActivity;
import lu.fisch.canze.activities.FieldTestActivity;
import lu.fisch.canze.activities.MainActivity;
-import lu.fisch.canze.activities.SpeedcontrolActivity;
import lu.fisch.canze.activities.ResearchActivity;
+import lu.fisch.canze.activities.SpeedcontrolActivity;
/**
* A simple {@link Fragment} subclass.
@@ -58,7 +57,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
activateButton(view, R.id.buttonDash, DashActivity.class);
activateButton(view, R.id.buttonSpeed, SpeedcontrolActivity.class);
- activateButton(view, R.id.buttonFieldTest, FieldTestActivity.class, false);
+ activateButton(view, R.id.buttonFieldTest, FieldTestActivity.class, true);
activateButton(view, R.id.buttonResearch, ResearchActivity.class);
return view;
@@ -82,13 +81,13 @@ public void onClick(View v) {
}
private void activateButton(View view, int buttonId, final Class> activityClass, boolean onlyDebug) {
- if (!onlyDebug){// || BuildConfig.BRANCH != "master") {
- activateButton(view, buttonId, activityClass);
- } else {
- // if on master and onlydebug is true, remove text and image
+ if (BuildConfig.BRANCH.equals("master") & onlyDebug) {
+ // if on master and onlyDebug is true, remove text and image
Button button = view.findViewById(buttonId);
button.setText("");
button.setCompoundDrawables(null, null,null, null);
+ } else {
+ activateButton(view, buttonId, activityClass);
}
}
diff --git a/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java b/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java
index 3b945e23..f26e9b2e 100644
--- a/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java
+++ b/app/src/main/java/lu/fisch/canze/fragments/MainFragment.java
@@ -57,8 +57,8 @@
public class MainFragment extends Fragment {
- static boolean firstRun = true;
- static String msg = "";
+ private static boolean firstRun = true;
+ private static String msg = "";
public MainFragment() {
// Required empty public constructor
diff --git a/app/src/main/java/lu/fisch/canze/fragments/SlidingTabLayout.java b/app/src/main/java/lu/fisch/canze/fragments/SlidingTabLayout.java
deleted file mode 100644
index 30585c0e..00000000
--- a/app/src/main/java/lu/fisch/canze/fragments/SlidingTabLayout.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- CanZE
- Take a closer look at your ZE car
-
- Copyright (C) 2015 - The CanZE Team
- http://canze.fisch.lu
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see
- * To use the component, simply add it to your view hierarchy. Then in your - * {@link android.app.Activity} or {@link Fragment} call - * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for. - *
- * The colors can be customized in two ways. The first and simplest is to provide an array of colors - * via {@link #setSelectedIndicatorColors(int...)}. The - * alternative is via the {@link TabColorizer} interface which provides you complete control over - * which color is used for any individual position. - *
- * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
- * providing the layout ID of your custom layout.
- */
-public class SlidingTabLayout extends HorizontalScrollView {
- /**
- * Allows complete control over the colors drawn in the tab layout. Set with
- * {@link #setCustomTabColorizer(TabColorizer)}.
- */
- public interface TabColorizer {
-
- /**
- * @return return the color of the indicator used when {@code position} is selected.
- */
- int getIndicatorColor(int position);
-
- }
-
- private static final int TITLE_OFFSET_DIPS = 24;
- private static final int TAB_VIEW_PADDING_DIPS = 16;
- private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
-
- private int mTitleOffset;
-
- private int mTabViewLayoutId;
- private int mTabViewTextViewId;
- private boolean mDistributeEvenly;
-
- private ViewPager mViewPager;
- private SparseArray
- * If you only require simple custmisation then you can use
- * {@link #setSelectedIndicatorColors(int...)} to achieve
- * similar effects.
- */
- public void setCustomTabColorizer(TabColorizer tabColorizer) {
- mTabStrip.setCustomTabColorizer(tabColorizer);
- }
-
- public void setDistributeEvenly(boolean distributeEvenly) {
- mDistributeEvenly = distributeEvenly;
- }
-
- /**
- * Sets the colors to be used for indicating the selected tab. These colors are treated as a
- * circular array. Providing one color will mean that all tabs are indicated with the same color.
- */
- public void setSelectedIndicatorColors(int... colors) {
- mTabStrip.setSelectedIndicatorColors(colors);
- }
-
- /**
- * Set the {@link ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are
- * required to set any {@link ViewPager.OnPageChangeListener} through this method. This is so
- * that the layout can update it's scroll position correctly.
- *
- * @see ViewPager#setOnPageChangeListener(ViewPager.OnPageChangeListener)
- */
- public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
- mViewPagerPageChangeListener = listener;
- }
-
- /**
- * Set the custom layout to be inflated for the tab views.
- *
- * @param layoutResId Layout id to be inflated
- * @param textViewId id of the {@link TextView} in the inflated view
- */
- public void setCustomTabView(int layoutResId, int textViewId) {
- mTabViewLayoutId = layoutResId;
- mTabViewTextViewId = textViewId;
- }
-
- /**
- * Sets the associated view pager. Note that the assumption here is that the pager content
- * (number of tabs and tab titles) does not change after this call has been made.
- */
- public void setViewPager(ViewPager viewPager) {
- mTabStrip.removeAllViews();
-
- mViewPager = viewPager;
- if (viewPager != null) {
- viewPager.setOnPageChangeListener(new InternalViewPagerListener());
- populateTabStrip();
- }
- }
-
- /**
- * Create a default view to be used for tabs. This is called if a custom tab view is not set via
- * {@link #setCustomTabView(int, int)}.
- */
- protected TextView createDefaultTabView(Context context) {
- TextView textView = new TextView(context);
- textView.setGravity(Gravity.CENTER);
- textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
- textView.setTypeface(Typeface.DEFAULT_BOLD);
- textView.setLayoutParams(new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-
- TypedValue outValue = new TypedValue();
- getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
- outValue, true);
- textView.setBackgroundResource(outValue.resourceId);
- textView.setAllCaps(true);
-
- int padding = (int) (TAB_VIEW_PADDING_DIPS * getResources().getDisplayMetrics().density);
- textView.setPadding(padding, padding, padding, padding);
-
- return textView;
- }
-
- private void populateTabStrip() {
- final PagerAdapter adapter = mViewPager.getAdapter();
- final View.OnClickListener tabClickListener = new TabClickListener();
-
- for (int i = 0; i < adapter.getCount(); i++) {
- View tabView = null;
- TextView tabTitleView = null;
-
- if (mTabViewLayoutId != 0) {
- // If there is a custom tab view layout id set, try and inflate it
- tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
- false);
- tabTitleView = tabView.findViewById(mTabViewTextViewId);
- }
-
- if (tabView == null) {
- tabView = createDefaultTabView(getContext());
- }
-
- if (tabTitleView == null && TextView.class.isInstance(tabView)) {
- tabTitleView = (TextView) tabView;
- }
-
- if (mDistributeEvenly) {
- LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) tabView.getLayoutParams();
- lp.width = 0;
- lp.weight = 1;
- }
-
- tabTitleView.setText(adapter.getPageTitle(i));
- tabView.setOnClickListener(tabClickListener);
- String desc = mContentDescriptions.get(i, null);
- if (desc != null) {
- tabView.setContentDescription(desc);
- }
-
- mTabStrip.addView(tabView);
- if (i == mViewPager.getCurrentItem()) {
- tabView.setSelected(true);
- }
- }
- }
-
- public void setContentDescription(int i, String desc) {
- mContentDescriptions.put(i, desc);
- }
-
- @Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
-
- if (mViewPager != null) {
- scrollToTab(mViewPager.getCurrentItem(), 0);
- }
- }
-
- private void scrollToTab(int tabIndex, int positionOffset) {
- final int tabStripChildCount = mTabStrip.getChildCount();
- if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
- return;
- }
-
- View selectedChild = mTabStrip.getChildAt(tabIndex);
- if (selectedChild != null) {
- int targetScrollX = selectedChild.getLeft() + positionOffset;
-
- if (tabIndex > 0 || positionOffset > 0) {
- // If we're not at the first child and are mid-scroll, make sure we obey the offset
- targetScrollX -= mTitleOffset;
- }
-
- scrollTo(targetScrollX, 0);
- }
- }
-
- private class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
- private int mScrollState;
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- int tabStripChildCount = mTabStrip.getChildCount();
- if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
- return;
- }
-
- mTabStrip.onViewPagerPageChanged(position, positionOffset);
-
- View selectedTitle = mTabStrip.getChildAt(position);
- int extraOffset = (selectedTitle != null)
- ? (int) (positionOffset * selectedTitle.getWidth())
- : 0;
- scrollToTab(position, extraOffset);
-
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageScrolled(position, positionOffset,
- positionOffsetPixels);
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- mScrollState = state;
-
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageScrollStateChanged(state);
- }
- }
-
- @Override
- public void onPageSelected(int position) {
- if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
- mTabStrip.onViewPagerPageChanged(position, 0f);
- scrollToTab(position, 0);
- }
- for (int i = 0; i < mTabStrip.getChildCount(); i++) {
- mTabStrip.getChildAt(i).setSelected(position == i);
- }
- if (mViewPagerPageChangeListener != null) {
- mViewPagerPageChangeListener.onPageSelected(position);
- }
- }
-
- }
-
- private class TabClickListener implements View.OnClickListener {
- @Override
- public void onClick(View v) {
- for (int i = 0; i < mTabStrip.getChildCount(); i++) {
- if (v == mTabStrip.getChildAt(i)) {
- mViewPager.setCurrentItem(i);
- return;
- }
- }
- }
- }
-
-}
diff --git a/app/src/main/java/lu/fisch/canze/fragments/SlidingTabStrip.java b/app/src/main/java/lu/fisch/canze/fragments/SlidingTabStrip.java
deleted file mode 100644
index 590775fb..00000000
--- a/app/src/main/java/lu/fisch/canze/fragments/SlidingTabStrip.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- CanZE
- Take a closer look at your ZE car
-
- Copyright (C) 2015 - The CanZE Team
- http://canze.fisch.lu
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see