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

#341 Opravy z testovací verze - neviditelné grafy statistik, padání

parent d37a09f5
......@@ -25,23 +25,17 @@
android:orientation="vertical"
android:paddingRight="15dp"
android:paddingTop="@dimen/screen_statistics_paddingtop" >
<include layout="@layout/screen_statistics_toppanel"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
<include layout="@layout/screen_statistics_toppanel" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<include layout="@layout/screen_statistics_cardfile"/>
<include layout="@layout/screen_statistics_cardfile" />
<include layout="@layout/screen_statistics_chart"/>
</LinearLayout>
</RelativeLayout>
<include layout="@layout/screen_statistics_chart" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -25,21 +25,9 @@
android:orientation="vertical"
android:paddingRight="15dp"
android:paddingTop="@dimen/screen_statistics_paddingtop" >
<include layout="@layout/screen_statistics_toppanel"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
<include layout="@layout/screen_statistics_toppanel" />
<include layout="@layout/screen_statistics_chart"/>
</LinearLayout>
</RelativeLayout>
<include layout="@layout/screen_statistics_chart" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -47,14 +47,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/screen_statistics_chart_background"
android:paddingTop="60dp" >
android:background="@drawable/screen_statistics_chart_background" >
<FrameLayout
android:id="@+id/screen_statistics_chart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="100dp" />
android:layout_width="match_parent"
android:layout_height="match_parent" />
<RelativeLayout
android:id="@+id/screen_statistics_chartdetail"
......
......@@ -16,75 +16,78 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_weight="1"
android:gravity="left"
android:maxLines="1"
android:text="@string/mainmenu_statistics"
android:textColor="@android:color/black"
android:textSize="@dimen/screen_statistics_title_size"
android:textStyle="bold" />
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<TextView
android:id="@+id/screen_statistics_displaytypebutton_text_individually"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/screen_statistics_displaytype_individually"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_weight="1"
android:gravity="left"
android:maxLines="1"
android:text="@string/mainmenu_statistics"
android:textColor="@android:color/black"
android:textSize="@dimen/screen_statistics_displaytype_textsize"
android:textSize="@dimen/screen_statistics_title_size"
android:textStyle="bold" />
<Switch
android:id="@+id/screen_statistics_displaytypeswitch"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:adjustViewBounds="true"
android:contentDescription="@string/screen_statistics_displaytypebutton"
android:scaleType="fitCenter"
android:textOff=""
android:textOn=""
android:thumb="@drawable/switch_center"
android:track="@drawable/switch_background" />
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal" >
<TextView
android:id="@+id/screen_statistics_displaytypebutton_text_dailyaverage"
<TextView
android:id="@+id/screen_statistics_displaytypebutton_text_individually"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/screen_statistics_displaytype_individually"
android:textColor="@android:color/black"
android:textSize="@dimen/screen_statistics_displaytype_textsize"
android:textStyle="bold" />
<Switch
android:id="@+id/screen_statistics_displaytypeswitch"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:adjustViewBounds="true"
android:contentDescription="@string/screen_statistics_displaytypebutton"
android:scaleType="fitCenter"
android:textOff=""
android:textOn=""
android:thumb="@drawable/switch_center"
android:track="@drawable/switch_background" />
<TextView
android:id="@+id/screen_statistics_displaytypebutton_text_dailyaverage"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:singleLine="true"
android:text="@string/screen_statistics_displaytype_dailyaverage"
android:textColor="@android:color/black"
android:textSize="@dimen/screen_statistics_displaytype_textsize"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/screen_statistics_difficultybutton_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center"
android:singleLine="true"
android:text="@string/screen_statistics_displaytype_dailyaverage"
android:textColor="@android:color/black"
android:textSize="@dimen/screen_statistics_displaytype_textsize"
android:textStyle="bold" />
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="0dp"
android:paddingRight="5dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/screen_statistics_difficultybutton_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="5dp"
android:paddingLeft="0dp" />
</LinearLayout>
\ No newline at end of file
</merge>
\ No newline at end of file
......@@ -209,7 +209,7 @@ public class SoundControl {
}
sleep(100);
} catch (Exception e) {
Log.w(e.getLocalizedMessage());
Log.w("Error " + e.getLocalizedMessage());
}
}
stopMedia(soundPath);
......
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