commit 054fbee110aba0a73e0d84fa734213c77480f1fe Author: Leszek Koltunski Date: Mon Jul 6 12:51:01 2020 +0100 Reinvent the Pattern Dialog (Part 2) diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java index 6f91ee8d..3e78c76d 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPatternListAdapter.java @@ -26,6 +26,7 @@ import android.view.ViewGroup; import android.widget.BaseExpandableListAdapter; import android.widget.TextView; +import org.distorted.main.RubikActivity; import org.distorted.patterns.RubikPattern; import org.distorted.main.R; @@ -34,14 +35,15 @@ import org.distorted.main.R; class RubikDialogPatternListAdapter extends BaseExpandableListAdapter { private Context mContext; - private int mTab; + private int mTab, mWidth; /////////////////////////////////////////////////////////////////////////////////////////////////// - public RubikDialogPatternListAdapter(Context context, int tab) + public RubikDialogPatternListAdapter(Context context, int tab, int width) { mContext = context; mTab = tab; + mWidth = width; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -74,10 +76,11 @@ class RubikDialogPatternListAdapter extends BaseExpandableListAdapter view = infalInflater.inflate(R.layout.dialog_pattern_child_item, null); } - TextView sequence = view.findViewById(R.id.sequence); - sequence.setText(mContext.getString(R.string.sq_placeholder,childPosition+1)); - TextView childItem = view.findViewById(R.id.childItem); + int size = (int)(mWidth* RubikActivity.PATTERN_CHILD_TEXT); + + TextView childItem = view.findViewById(R.id.child); childItem.setText(childName); + childItem.setTextSize(size); return view; } @@ -130,8 +133,17 @@ class RubikDialogPatternListAdapter extends BaseExpandableListAdapter view = inf.inflate(R.layout.dialog_pattern_group_item, null); } + int size = (int)(mWidth* RubikActivity.PATTERN_GROUP_TEXT); + TextView heading = view.findViewById(R.id.heading); heading.setText(groupName); + heading.setTextSize(size); + + RubikPattern pattern = RubikPattern.getInstance(); + int numPatterns = pattern.getNumPatterns(mTab,groupPosition); + TextView counter = view.findViewById(R.id.counter); + counter.setText(String.format("%d", numPatterns)); + counter.setTextSize(size); return view; } diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPatternPagerAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogPatternPagerAdapter.java index 2170ca3e..f469b6a5 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPatternPagerAdapter.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPatternPagerAdapter.java @@ -60,8 +60,9 @@ class RubikDialogPatternPagerAdapter extends PagerAdapter for(int i=0; i=0 ) + { + mListView.expandGroup(mExpandedGroup); + } + + int visible = pattern.recallVisiblePos(mTab); + mListView.setSelectionFromTop(visible,0); + mListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { @Override @@ -126,23 +136,15 @@ public class RubikDialogPatternView extends FrameLayout /////////////////////////////////////////////////////////////////////////////////////////////////// - int getCurrentScrollPos() + int getCurrentVisiblePos() { - return 0;//mScroll.getScrollY(); + return mListView.getFirstVisiblePosition(); } /////////////////////////////////////////////////////////////////////////////////////////////////// - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) + int getExpanded() { - super.onLayout(changed,left,top,right,bottom); -/* - if( !changed ) - { - final RubikPattern pattern = RubikPattern.getInstance(); - mScroll.setScrollY( pattern.recallScrollPos(mTab) ); - } - */ + return mExpandedGroup; } } diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java index bcd71712..22fc5245 100644 --- a/src/main/java/org/distorted/main/RubikActivity.java +++ b/src/main/java/org/distorted/main/RubikActivity.java @@ -43,13 +43,15 @@ import org.distorted.states.RubikStatePlay; public class RubikActivity extends AppCompatActivity { - public static final float PADDING = 0.01f; - public static final float MARGIN = 0.004f; - public static final float LARGE_MARGIN = 0.025f; - public static final float BUTTON_TEXT_SIZE = 0.05f; - public static final float TITLE_TEXT_SIZE = 0.06f; - public static final float BITMAP_TEXT_SIZE = 0.09f; - public static final float MENU_ITEM_SIZE = 0.12f; + public static final float PADDING = 0.01f; + public static final float MARGIN = 0.004f; + public static final float LARGE_MARGIN = 0.025f; + public static final float BUTTON_TEXT_SIZE = 0.05f; + public static final float TITLE_TEXT_SIZE = 0.06f; + public static final float BITMAP_TEXT_SIZE = 0.09f; + public static final float MENU_ITEM_SIZE = 0.12f; + public static final float PATTERN_GROUP_TEXT = 0.012f; + public static final float PATTERN_CHILD_TEXT = 0.008f; public static final float MENU_BIG_TEXT_SIZE = 0.05f; public static final float MENU_MEDIUM_TEXT_SIZE= 0.04f; diff --git a/src/main/java/org/distorted/patterns/RubikPattern.java b/src/main/java/org/distorted/patterns/RubikPattern.java index f45e9b53..a63514f1 100644 --- a/src/main/java/org/distorted/patterns/RubikPattern.java +++ b/src/main/java/org/distorted/patterns/RubikPattern.java @@ -32,9 +32,10 @@ public class RubikPattern { private static final int DURATION_MILLIS = 750; - private int[] numCategories = new int[NUM_OBJECTS]; - private int[] currentCategory = new int[NUM_OBJECTS]; - private int[] currentScrollPos= new int[NUM_OBJECTS]; + private int[] numCategories = new int[NUM_OBJECTS]; + private int[] currentCategory = new int[NUM_OBJECTS]; + private int[] currentVisiblePos= new int[NUM_OBJECTS]; + private int[] currentExpanded = new int[NUM_OBJECTS]; private List> mCategories; private static RubikPattern mThis; @@ -361,6 +362,8 @@ public class RubikPattern mCategories.add(list); numCategories[i]=patStrings.length; + + currentExpanded[i] = -1; } } @@ -418,12 +421,13 @@ public class RubikPattern /////////////////////////////////////////////////////////////////////////////////////////////////// - public void rememberState(int tab, int cat, int scrollPos) + public void rememberState(int tab, int cat, int scrollPos, int expanded) { if( tab>=0 && tab=0 && tab=0 && tab=0 && tab - + android:orientation="vertical" > + android:layout_marginTop="5sp" + android:layout_marginBottom="5sp" + android:paddingLeft="35sp"/> - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/main/res/layout/dialog_pattern_group_item.xml b/src/main/res/layout/dialog_pattern_group_item.xml index 56dd3397..f60e1ece 100644 --- a/src/main/res/layout/dialog_pattern_group_item.xml +++ b/src/main/res/layout/dialog_pattern_group_item.xml @@ -1,14 +1,29 @@ - + android:orientation="horizontal"> + android:textStyle="bold" + /> - \ No newline at end of file + + + diff --git a/src/main/res/layout/dialog_pattern_tab.xml b/src/main/res/layout/dialog_pattern_tab.xml index fed5d465..49e13d68 100644 --- a/src/main/res/layout/dialog_pattern_tab.xml +++ b/src/main/res/layout/dialog_pattern_tab.xml @@ -2,8 +2,8 @@