|
|
@@ -19,7 +19,8 @@
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="fill_parent"
|
|
|
android:nestedScrollingEnabled="false"
|
|
|
- tools:ignore="UnusedAttribute">
|
|
|
+ tools:ignore="UnusedAttribute"
|
|
|
+ android:id="@+id/sv_menu">
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
@@ -27,7 +28,8 @@
|
|
|
android:divider="@drawable/divider"
|
|
|
android:orientation="vertical"
|
|
|
android:padding="10dp"
|
|
|
- android:baselineAligned="false" >
|
|
|
+ android:baselineAligned="false"
|
|
|
+ android:id="@+id/ll_menu">
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/menu_home"
|
|
|
@@ -225,29 +227,31 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:background="@drawable/titlebar"
|
|
|
android:gravity="center_vertical"
|
|
|
- android:orientation="horizontal" >
|
|
|
+ android:orientation="horizontal"
|
|
|
+ android:padding="2dp">
|
|
|
|
|
|
<!-- Button to open slider menu -->
|
|
|
|
|
|
<ImageButton
|
|
|
android:id="@+id/bt_menu"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+ android:layout_width="40dp"
|
|
|
+ android:layout_height="40dp"
|
|
|
android:layout_weight=".2"
|
|
|
- android:adjustViewBounds="true"
|
|
|
+ android:adjustViewBounds="false"
|
|
|
android:background="#00000000"
|
|
|
android:contentDescription="@string/app_name"
|
|
|
- android:maxHeight="60dp"
|
|
|
- android:maxWidth="60dp"
|
|
|
- android:padding="2dp"
|
|
|
+ android:maxHeight="20dp"
|
|
|
+ android:maxWidth="20dp"
|
|
|
android:scaleType="fitCenter"
|
|
|
- android:src="@drawable/ic_launcher" />
|
|
|
+ android:src="@drawable/menu"
|
|
|
+ android:padding="2dp"
|
|
|
+ android:alpha=".5"/>
|
|
|
|
|
|
<!-- Layout with the app title and current section -->
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="wrap_content"
|
|
|
- android:layout_height="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
android:layout_gravity="center"
|
|
|
android:layout_weight=".8"
|
|
|
android:gravity="center"
|
|
|
@@ -275,12 +279,25 @@
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
+ <ImageView
|
|
|
+ android:layout_width="40dp"
|
|
|
+ android:layout_height="40dp"
|
|
|
+ android:id="@+id/iv_logo"
|
|
|
+ android:src="@drawable/ic_launcher"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ android:layout_weight=".2"
|
|
|
+ android:maxHeight="45dp"
|
|
|
+ android:maxWidth="45dp"
|
|
|
+ android:padding="1dp"/>
|
|
|
+
|
|
|
<ProgressBar
|
|
|
android:id="@+id/pb_sync"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+ android:layout_width="40dp"
|
|
|
+ android:layout_height="40dp"
|
|
|
android:layout_weight=".2"
|
|
|
- android:visibility="invisible" />
|
|
|
+ android:visibility="gone"
|
|
|
+ android:maxHeight="40dp"
|
|
|
+ android:maxWidth="40dp"/>
|
|
|
|
|
|
</LinearLayout>
|
|
|
|