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

tMerge branch 'devel' of gitlab.labs.nic.cz:labs/tablexia into devel

parents 218d555f 15c7d745
......@@ -244,8 +244,7 @@
android:layout_height="match_parent"
android:background="@color/dark_tansparent"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5" >
android:visibility="gone" >
<FrameLayout
android:layout_width="match_parent"
......@@ -255,13 +254,12 @@
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3" >
android:layout_height="wrap_content" >
<LinearLayout
android:id="@+id/newuser_avatars"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
</LinearLayout>
</HorizontalScrollView>
......
......@@ -229,8 +229,7 @@
android:layout_height="match_parent"
android:background="@color/dark_tansparent"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5" >
android:visibility="gone" >
<FrameLayout
android:layout_width="match_parent"
......@@ -240,13 +239,12 @@
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3" >
android:layout_height="wrap_content" >
<LinearLayout
android:id="@+id/newuser_avatars"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
</LinearLayout>
</HorizontalScrollView>
......
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/newuser_mugshot_picker_photo_width"
android:layout_height="@dimen/newuser_mugshot_height"
android:background="@color/transparent"
android:orientation="vertical" >
<FrameLayout
android:id="@+id/film_top"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@drawable/newuser_film_outerline" />
<include
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="10"
layout="@layout/newuser_mugshot_rectangle" />
<FrameLayout
android:id="@+id/film_bottom"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@drawable/newuser_film_outerline" />
</LinearLayout>
\ No newline at end of file
......@@ -200,22 +200,6 @@
android:thumbOffset="@dimen/newuser_seekbar_thumb_offset" />
</FrameLayout>
<!-- NOVY switch pro vyber pohlavi -->
<!--
<Switch
android:id="@+id/newuser_sex_switch_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:scaleX="0.7"
android:scaleY="0.7"
android:textOff=""
android:textOn=""
android:thumb="@drawable/switch_center"
android:track="@drawable/switch_background"
android:translationX="-5dp" />
-->
<ImageView
android:id="@+id/newuser_sex_male_image"
......
......@@ -178,8 +178,7 @@
android:layout_height="match_parent"
android:background="@color/dark_tansparent"
android:orientation="vertical"
android:visibility="gone"
android:weightSum="5" >
android:visibility="gone" >
<FrameLayout
android:layout_width="match_parent"
......@@ -189,13 +188,12 @@
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3" >
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/newuser_avatars"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
</LinearLayout>
</HorizontalScrollView>
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/white" >
<ImageView
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ImageView
android:id="@+id/newuser_mugshot_photo"
android:layout_width="@dimen/newuser_mugshot_picker_photo_width"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/mugshot00"
android:adjustViewBounds="true"
android:scaleType="centerCrop"/>
<ImageView
android:scaleType="centerCrop"
android:src="@drawable/mugshot00" />
<ImageView
android:id="@+id/newuser_mugshot_film"
android:layout_width="@dimen/newuser_mugshot_picker_photo_width"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/newuser_film"
android:adjustViewBounds="true"
android:scaleType="fitXY"/>
android:scaleType="fitXY"
android:src="@drawable/newuser_film_inside" />
</RelativeLayout>
</FrameLayout>
\ No newline at end of file
......@@ -23,7 +23,6 @@
<dimen name="game_bankovniloupez_rulemessage_textmaxwidth">500dp</dimen>
<dimen name="game_bankovniloupez_rulemessage_buttonWidth">160dp</dimen>
<dimen name="game_bankovniloupez_rulemessage_buttonFontsize">18sp</dimen>
<dimen name="screen_statistics_starcounter_background_width">200dp</dimen>
<dimen name="screen_statistics_starcounter_text_size">30sp</dimen>
<dimen name="screen_statistics_starcounter_text_margintop">40dp</dimen>
......@@ -35,22 +34,15 @@
<dimen name="screen_statistics_difficultyradio_imagesize">50dp</dimen>
<dimen name="screen_statistics_gamelist_item_textsize">12sp</dimen>
<dimen name="screen_statistics_difficultyradio_textsize">14sp</dimen>
<dimen name="screen_halloffame_starcounter_padding">8dp</dimen>
<dimen name="screen_halloffame_starcounter_textsize">22sp</dimen>
<dimen name="newuser_signature_width">600dp</dimen>
<dimen name="newuser_signature_height">360dp</dimen>
<dimen name="gameloadingscreen_button_width">180dp</dimen>
<dimen name="gameloadingscreen_background_width">500dp</dimen>
<dimen name="gameloadingscreen_height">400dp</dimen>
<dimen name="gameloadingscreen_text">22sp</dimen>
<dimen name="gameloadingscreen_button_text">18sp</dimen>
<dimen name="victoryscreen_message_width">450dp</dimen>
<dimen name="victoryscreen_background_width">550dp</dimen>
<dimen name="victoryscreen_ratingstar_height">70dp</dimen>
......@@ -68,33 +60,31 @@
<dimen name="victoryscreen_button_marginright">40dp</dimen>
<dimen name="victoryscreen_buttons_paddingtop">20dp</dimen>
<dimen name="victoryscreen_button_textsize">18sp</dimen>
<dimen name="newuseranim_detectiveoffice_bubble_width">250dp</dimen>
<dimen name="newuseranim_detectiveoffice_bubble_height">176dp</dimen>
<dimen name="newuseranim_detectivedialog_bubble_fontsize">18sp</dimen>
<dimen name="newuseranim_newspaper_topic_fontsize">15dp</dimen>
<dimen name="newuseranim_newspaper_topicbubble_width">250dp</dimen>
<dimen name="newuseranim_newspaper_topicbubble_height">160dp</dimen>
<dimen name="newuseranim_newuserform_help_fontsize">22sp</dimen>
<dimen name="mainmenu_togglebutton_offset">0dp</dimen>
<dimen name="screen_gamemenu_startmenu_helpbutton_size">70dp</dimen>
<dimen name="screen_gamemenu_startmenu_helpbutton_margin">2dp</dimen>
<dimen name="screen_gamemenu_startbutton_height">150dp</dimen>
<dimen name="screen_gamemenu_titleimage_width">700dp</dimen>
<dimen name="screen_gamemenu_titleimage_maxheight">200dp</dimen>
<dimen name="screen_loader_versionname">8sp</dimen>
<item name="tablexiadialog_button_scale" type="dimen" format="float">1.0</item>
<item name="tablexiadialog_button_scale" format="float" type="dimen">1.0</item>
<dimen name="tablexiadialog_paddinbottom">30dp</dimen>
<dimen name="tablexiadialog_button_space">30dp</dimen>
<dimen name="newuser_seekbar_translation_y">23dp</dimen>
<dimen name="newuser_seekbar_framelayout_height">85dp</dimen>
<dimen name="newuser_seekbar_background_margin_top">22dp</dimen>
<dimen name="newuser_seekbar_thumb_offset">-15dp</dimen>
<dimen name="newuser_mugshot_picker_photo_width">300dp</dimen>
<dimen name="newuser_mugshot_height">450dp</dimen>
</resources>
</resources>
\ No newline at end of file
......@@ -128,6 +128,7 @@
<dimen name="newuser_seekbar_framelayout_height">85dp</dimen>
<dimen name="newuser_seekbar_background_margin_top">22dp</dimen>
<dimen name="newuser_seekbar_thumb_offset">2dp</dimen>
<dimen name="newuser_mugshot_picker_photo_width">300dp</dimen>
<dimen name="newuser_mugshot_picker_photo_width">150dp</dimen>
<dimen name="newuser_mugshot_height">250dp</dimen>
</resources>
......@@ -30,6 +30,7 @@ import roboguice.inject.InjectView;
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
import android.animation.AnimatorListenerAdapter;
import android.app.ActionBar.LayoutParams;
import android.app.Activity;
import android.app.DialogFragment;
import android.content.Context;
......@@ -237,9 +238,9 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
LinearLayout ll = (LinearLayout) mugshotPicker.findViewById(R.id.newuser_avatars);
for (int i = FIRST_AVAILABLE_PHOTO_INDEX; i < (FIRST_AVAILABLE_PHOTO_INDEX + NUMBER_OF_PHOTOS); i++) {
View mugshotView = inflater.inflate(R.layout.newuser_mugshot_rectangle, null);
View mugshotView = inflater.inflate(R.layout.composite_newuser_mugshot, null);
ImageView photo = (ImageView) mugshotView.findViewById(R.id.newuser_mugshot_photo);
ImageView film = (ImageView) mugshotView.findViewById(R.id.newuser_mugshot_film);
//ImageView film = (ImageView) mugshotView.findViewById(R.id.newuser_mugshot_film);
String photoNumber;
if (i < 10) {
photoNumber = "0" + i;
......@@ -255,7 +256,6 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
public void onClick(View v) {
avatarName = (String) v.getTag();
imageViewMugshot.setBackgroundResource((getResources().getIdentifier(avatarName, "drawable", getActivity().getPackageName())));
imageViewMugshot.setAdjustViewBounds(true);
mugshotPicker.setVisibility(View.GONE);
if (!covernameHelVisible) {
txvHelpCovername.setVisibility(View.VISIBLE);
......@@ -267,8 +267,8 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
}
});
film.setMinimumWidth(photo.getMeasuredWidth());
ll.addView(mugshotView);
// film.setMinimumWidth(photo.getMeasuredWidth());
ll.addView(mugshotView, new LayoutParams(getResources().getDimensionPixelSize(R.dimen.newuser_mugshot_picker_photo_width), getResources().getDimensionPixelSize(R.dimen.newuser_mugshot_height)));
}
view.addOnLayoutChangeListener(new OnLayoutChangeListener() {
......@@ -281,7 +281,7 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
}
});
prepareDifficultySeekBar(view); // FIX zmenit nazev metod, kdyz uz jsou kopirovane, aby bylo jasne co delaji
prepareSexChooser(view);
MediaPlayerHelper.playSound("newuser/mfx/profil_foto.mp3", true, getActivity());
......@@ -934,7 +934,7 @@ public class NewUserFormFragment extends RoboFragment implements OnClickListener
*/
// TODO play seekbar sounds
private void prepareDifficultySeekBar(View layout) {
private void prepareSexChooser(View layout) {
difficultySeekbar = (SeekBar) layout.findViewById(R.id.newuser_sex_seekbar);
difficultySeekbar.incrementProgressBy(1);
......
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