Commit 87e73080 authored by Luboš Horáček's avatar Luboš Horáček

Oprava pozice bublin

parent c35b70b5
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
android:textSize="@dimen/newuseranim_newspaper_topic_fontsize" android:textSize="@dimen/newuseranim_newspaper_topic_fontsize"
android:visibility="gone" android:visibility="gone"
custom:displayRatioType="height" custom:displayRatioType="height"
custom:xPositionRatio="0.15" custom:xPositionRatio="0.17"
custom:yPositionRatio="0.1" /> custom:yPositionRatio="0.1" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
******************************************************************************/ ******************************************************************************/
package cz.nic.tablexia.menu.mainmenu; package cz.nic.tablexia.menu.mainmenu;
import android.app.Activity; import android.app.Activity;
...@@ -149,7 +150,6 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh ...@@ -149,7 +150,6 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh
collapseAllMenu(tablexiaContext); collapseAllMenu(tablexiaContext);
} }
/** /**
* Change selected menu and main screen if its needed * Change selected menu and main screen if its needed
* *
...@@ -336,12 +336,12 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh ...@@ -336,12 +336,12 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh
@Override @Override
public void positiveAction() { public void positiveAction() {
// tablexiaContext.showNewUserScreen(); // tablexiaContext.showNewUserScreen();
//TODO add code for starting animation on new user click from game menu while user logged in // TODO add code for starting animation on new user click from game menu while user logged in
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString("NEWUSER_GAMEMENU", "NEWUSER_GAMEMENU"); args.putString("NEWUSER_GAMEMENU", "NEWUSER_GAMEMENU");
((MainActivity) tablexiaContext.getCurrentMenuActivity()).showLoadingScreen(true, args); ((MainActivity) tablexiaContext.getCurrentMenuActivity()).showLoadingScreen(true, args);
tablexiaContext.changeMenu(AbstractMenu.USER_MENU);
((MainActivity) tablexiaContext.getCurrentMenuActivity()).lockCloseMenuDrawer(); ((MainActivity) tablexiaContext.getCurrentMenuActivity()).lockCloseMenuDrawer();
tablexiaContext.changeMenu(AbstractMenu.USER_MENU);
userSpinner.setSelection(userSpinnerAdapter.getUserPositionInList(tablexiaContext.getCurrentMenuActivity().getTablexiaContext().getSelectedUser().getNickName())); userSpinner.setSelection(userSpinnerAdapter.getUserPositionInList(tablexiaContext.getCurrentMenuActivity().getTablexiaContext().getSelectedUser().getNickName()));
tablexiaContext.getTablexiaState().setAndSaveActiveUser(null); tablexiaContext.getTablexiaState().setAndSaveActiveUser(null);
super.positiveAction(); super.positiveAction();
...@@ -351,7 +351,7 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh ...@@ -351,7 +351,7 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh
} else { } else {
tablexiaContext.doSelectUser(userSpinnerAdapter.getUserAtPosition(position)); tablexiaContext.doSelectUser(userSpinnerAdapter.getUserAtPosition(position));
((TextView)view.findViewById(R.id.usermenu_text)).setTypeface(Typeface.DEFAULT); ((TextView) view.findViewById(R.id.usermenu_text)).setTypeface(Typeface.DEFAULT);
view.findViewById(R.id.usermenu_selector).setVisibility(View.GONE); view.findViewById(R.id.usermenu_selector).setVisibility(View.GONE);
} }
} }
...@@ -413,9 +413,7 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh ...@@ -413,9 +413,7 @@ public class MainMenu extends AbstractMenu implements OnGroupClickListener, OnCh
// show menu selected/unselected icon // show menu selected/unselected icon
int menuIconResourceId = -1; int menuIconResourceId = -1;
final ImageView itemImage = (ImageView) convertView.findViewById(MAINMENU_GROUPITEM_IMAGE_ID); final ImageView itemImage = (ImageView) convertView.findViewById(MAINMENU_GROUPITEM_IMAGE_ID);
if (isActiveMenuItem(MainMenuDefinition.getMenuItemAtPosition(position)) || if (isActiveMenuItem(MainMenuDefinition.getMenuItemAtPosition(position)) || (isActiveMenuItem(MainMenuDefinition.START) && (MainMenuDefinition.getMenuItemAtPosition(position) == MainMenuDefinition.GAMES)) || ((getSelectedMenuItem() instanceof GamesDefinition) && (MainMenuDefinition.getMenuItemAtPosition(position) == MainMenuDefinition.GAMES))) {
(isActiveMenuItem(MainMenuDefinition.START) && (MainMenuDefinition.getMenuItemAtPosition(position) == MainMenuDefinition.GAMES)) ||
((getSelectedMenuItem() instanceof GamesDefinition) && (MainMenuDefinition.getMenuItemAtPosition(position) == MainMenuDefinition.GAMES))) {
menuIconResourceId = MainMenuDefinition.getMenuItemAtPosition(position).getMenuIconSelectedResourceId(); menuIconResourceId = MainMenuDefinition.getMenuItemAtPosition(position).getMenuIconSelectedResourceId();
} else { } else {
......
...@@ -57,6 +57,7 @@ public class NewspaperDialog extends TablexiaDialog { ...@@ -57,6 +57,7 @@ public class NewspaperDialog extends TablexiaDialog {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(new Intent("cz.nic.tablexia.action.SLIDE_NEWSPAPER")); LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(new Intent("cz.nic.tablexia.action.SLIDE_NEWSPAPER"));
dismiss();
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment