Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed layout for dialog.

Browse source
This commit is contained in:
GaidamakUA 2015-12-22 17:58:29 +02:00
parent f78f7cc045
commit d98bf7539f
4 changed files with 88 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
OsmAnd/res/layout/dialog_live_updates_item_settings.xml
View file

@ -3,48 +3,71 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical"
android:theme="@style/OsmandLightTheme">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="125dp"
android:background="@color/dashboard_blue" android:background="@color/dashboard_blue"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="24dp">
<TextView <TextView
android:id="@+id/regionNameTextView" android:id="@+id/regionNameTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/color_white"
tools:text="Flevoland"/> tools:text="Flevoland"/>
<TextView <TextView
android:id="@+id/countryNameTextView" android:id="@+id/countryNameTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:visibility="visible" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white_80_transparent"
android:textSize="12sp"
android:visibility="gone" android:visibility="gone"
tools:text="The Netherlands"/> tools:text="The Netherlands"
tools:visibility="visible"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/color_white"/> android:background="@color/white_50_transparent"/>
<TextView <TextView
android:id="@+id/lastUpdateTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="40dp"
android:text="Update: 4 Dec 2015, 14:41"/> android:layout_gravity="bottom"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="12sp"
tools:text="Update: 4 Dec 2015, 14:41"/>
</LinearLayout> </LinearLayout>
<GridLayout <GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:columnCount='2'
android:padding="24dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="0" android:layout_column="0"
android:layout_row="1" android:layout_row="1"
android:gravity="center"
android:text="@string/live_update"/> android:text="@string/live_update"/>
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
@ -53,40 +76,79 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="0" android:layout_column="0"
android:layout_row="2" android:layout_row="2"
android:gravity="center"
android:text="@string/only_download_over_wifi"/> android:text="@string/only_download_over_wifi"/>
<android.support.v7.widget.SwitchCompat <CheckBox
android:id="@+id/downloadOverWiFiSwitch" android:id="@+id/downloadOverWiFiSwitch"
android:layout_gravity="right"/> android:layout_gravity="right"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="0" android:layout_column="0"
android:layout_row="3" android:layout_row="3"
android:gravity="center"
android:text="@string/update_every"/> android:text="@string/update_every"/>
<Spinner <Spinner
android:id="@+id/updateFrequencySpinner" android:id="@+id/updateFrequencySpinner"
style="@style/OsmandLightTheme.Spinner"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="1" android:layout_column="1"
android:layout_gravity="right" android:layout_gravity="right"
android:entries="@array/update_frequencies_array"/> android:entries="@array/update_frequencies_array"
android:gravity="left"
android:paddingLeft="0dp"/>
<TextView
android:id="@+id/updateTimesOfDayLabel"
android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="0"
android:layout_row="4"
android:gravity="center"
android:text="@string/update_time"/>
<Spinner <Spinner
android:id="@+id/updateTimesOfDaySpinner" android:id="@+id/updateTimesOfDaySpinner"
style="@style/OsmandLightTheme.Spinner"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="1" android:layout_column="1"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_row="4" android:layout_row="4"
android:entries="@array/update_times_of_day" android:entries="@array/update_times_of_day"
android:visibility="gone"/> android:gravity="left"
android:paddingLeft="0dp"/>
<TextView
android:id="@+id/sizeTextView"
android:layout_width="wrap_content"
android:layout_height="54dp"
android:layout_column="0"
android:layout_row="5"
android:gravity="center"
tools:text="Updates: 65NB"/>
<Button
android:id="@+id/removeUpdatesButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_column="1"
android:layout_gravity="right"
android:layout_row="5"
android:gravity="right|center_vertical"
android:text="@string/shared_string_clear"/>
</GridLayout> </GridLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/color_white"/> android:background="?attr/divider_color"/>
</LinearLayout> </LinearLayout>

4
OsmAnd/res/values/colors.xml
View file

@ -185,4 +185,8 @@
<color name="region_updateable">#55FF8F00</color> <color name="region_updateable">#55FF8F00</color>
<color name="region_selected">#55FFFF00</color> <color name="region_selected">#55FFFF00</color>
<color name="region_downloading">#44FF61FF</color> <color name="region_downloading">#44FF61FF</color>
<!-- Dialog Live Updates Settings -->
<color name="white_50_transparent">#8FFF</color>
<color name="white_80_transparent">#CFFF</color>
</resources> </resources>

2
OsmAnd/res/values/strings.xml
View file

@ -2131,4 +2131,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="update_now">Update now</string> <string name="update_now">Update now</string>
<string name="missing_write_external_storage_permission">App have no permission to use SD card</string> <string name="missing_write_external_storage_permission">App have no permission to use SD card</string>
<string name="last_update">Last update: %s</string> <string name="last_update">Last update: %s</string>
<string name="update_date_pattern">"Update: %s"</string>
<string name="update_time">Update time</string>
</resources> </resources>

7
OsmAnd/res/values/styles.xml
View file

@ -146,6 +146,13 @@
<item name="colorAccent">@color/osmand_orange</item> <item name="colorAccent">@color/osmand_orange</item>
</style> </style>
<style name="OsmandLightTheme.Spinner" parent="Widget.AppCompat.Light.Spinner.DropDown.ActionBar">
<item name="android:background">?android:selectableItemBackground</item>
<item name="android:dropDownSelector">?android:selectableItemBackground</item>
<item name="android:divider">@null</item>
<item name="overlapAnchor">true</item>
</style>
<style name="OsmandDarkTheme.DarkActionbar"> <style name="OsmandDarkTheme.DarkActionbar">
<item name="colorAccent">@color/color_white</item> <item name="colorAccent">@color/color_white</item>
</style> </style>