Revision 4a6b3b53
Added by Leszek Koltunski 6 months ago
src/main/java/org/distorted/main/MainObjectPopup.java | ||
---|---|---|
49 | 49 |
mPopup.setContentView(layout); |
50 | 50 |
mPopup.setFocusable(true); |
51 | 51 |
|
52 |
boolean firstButtonShown = false; |
|
53 |
|
|
52 | 54 |
mMenuTextSize = (int)(height*MENU_TEXT_SIZE); |
53 | 55 |
int padding = (int)(height*MENU_MARGIN); |
54 | 56 |
int marginH = padding/2; |
... | ... | |
63 | 65 |
if( object!=null && object.hasSolver() ) |
64 | 66 |
{ |
65 | 67 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,levelHeight); |
66 |
params.setMargins(marginH,marginV,marginH,marginV);
|
|
68 |
params.setMargins(marginH,marginH,marginH,marginV);
|
|
67 | 69 |
b1.setLayoutParams(params); |
68 | 70 |
b1.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize); |
71 |
|
|
69 | 72 |
b1.setOnClickListener(new View.OnClickListener() |
70 | 73 |
{ |
71 | 74 |
@Override |
... | ... | |
75 | 78 |
act.switchToSolver(ordinal); |
76 | 79 |
} |
77 | 80 |
}); |
81 |
|
|
82 |
firstButtonShown = true; |
|
78 | 83 |
} |
79 | 84 |
else b1.setVisibility(GONE); |
80 | 85 |
|
... | ... | |
83 | 88 |
if( object!=null && object.hasPatterns() ) |
84 | 89 |
{ |
85 | 90 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,levelHeight); |
86 |
params.setMargins(marginH,marginV,marginH,marginV);
|
|
91 |
params.setMargins(marginH, firstButtonShown ? marginV : marginH ,marginH,marginV);
|
|
87 | 92 |
b2.setLayoutParams(params); |
88 | 93 |
b2.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize); |
94 |
|
|
89 | 95 |
b2.setOnClickListener(new View.OnClickListener() |
90 | 96 |
{ |
91 | 97 |
@Override |
... | ... | |
95 | 101 |
act.switchToPattern(ordinal); |
96 | 102 |
} |
97 | 103 |
}); |
104 |
|
|
105 |
firstButtonShown = true; |
|
98 | 106 |
} |
99 | 107 |
else b2.setVisibility(GONE); |
100 | 108 |
|
... | ... | |
103 | 111 |
if( object!=null && object.hasExtras() ) |
104 | 112 |
{ |
105 | 113 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,levelHeight); |
106 |
params.setMargins(marginH,marginV,marginH,marginV);
|
|
114 |
params.setMargins(marginH,firstButtonShown ? marginV : marginH,marginH,marginV);
|
|
107 | 115 |
b3.setLayoutParams(params); |
108 | 116 |
b3.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize); |
117 |
|
|
109 | 118 |
b3.setOnClickListener(new View.OnClickListener() |
110 | 119 |
{ |
111 | 120 |
@Override |
... | ... | |
115 | 124 |
act.switchToTutorial(ordinal); |
116 | 125 |
} |
117 | 126 |
}); |
127 |
|
|
128 |
firstButtonShown = true; |
|
118 | 129 |
} |
119 | 130 |
else b3.setVisibility(GONE); |
120 | 131 |
|
121 | 132 |
Button b4 = layout.findViewById(R.id.objectInfo); |
122 | 133 |
|
123 | 134 |
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,levelHeight); |
124 |
params.setMargins(marginH,marginV,marginH,marginV);
|
|
135 |
params.setMargins(marginH,firstButtonShown ? marginV : marginH,marginH,marginV);
|
|
125 | 136 |
b4.setLayoutParams(params); |
126 | 137 |
b4.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize); |
138 |
|
|
127 | 139 |
b4.setOnClickListener( new View.OnClickListener() |
128 | 140 |
{ |
129 | 141 |
@Override |
... | ... | |
178 | 190 |
level[i].setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize); |
179 | 191 |
level[i].setLayoutParams(params); |
180 | 192 |
level[i].setPadding(0,0,0,0); |
193 |
|
|
181 | 194 |
level[i].setOnClickListener( new View.OnClickListener() |
182 | 195 |
{ |
183 | 196 |
@Override |
... | ... | |
187 | 200 |
} |
188 | 201 |
}); |
189 | 202 |
} |
203 |
|
|
204 |
int index = (numScramble>=1 && numScramble<=7) ? numScramble : LEVELS_SHOWN; |
|
205 |
LinearLayout.LayoutParams params2 = new LinearLayout.LayoutParams(levelWidth,levelHeight); |
|
206 |
params2.setMargins(margin,-margin,margin,margin); |
|
207 |
level[index].setLayoutParams(params2); |
|
190 | 208 |
} |
191 | 209 |
|
192 | 210 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Progress with Tutorial activity; make the main ObjectPopup look nicer.