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

Merge pull request #8771 from osmandapp/export_import_fix_ui

Browse source 
Export import fix ui
This commit is contained in:
Vitaliy 2020-04-09 14:36:59 +03:00 committed by GitHub
commit 07032ca760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/layout/fragment_import.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activity_background_basic">
android:background="?attr/activity_background_color">
<ExpandableListView
android:id="@+id/list"
@ -103,7 +103,7 @@
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_expanded"
android:background="?attr/colorPrimary"
android:background="?attr/actionModeBackground"
osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
osmand:expandedTitleMarginEnd="@dimen/content_padding"
osmand:expandedTitleMarginStart="@dimen/content_padding"

4
OsmAnd/res/layout/fragment_import_complete.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/activity_background_basic">
android:background="?attr/activity_background_color">
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll"
@ -101,7 +101,7 @@
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_expanded"
android:background="?attr/colorPrimary"
android:background="?attr/actionModeBackground"
osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
osmand:expandedTitleMarginEnd="@dimen/content_padding"
osmand:expandedTitleMarginStart="@dimen/content_padding"

4
OsmAnd/res/layout/fragment_import_duplicates.xml
View file

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="?attr/activity_background_basic">
android:background="?attr/activity_background_color">
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll"
@ -112,7 +112,7 @@
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height_expanded"
android:background="?attr/colorPrimary"
android:background="?attr/actionModeBackground"
osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
osmand:expandedTitleMarginEnd="@dimen/content_padding"
osmand:expandedTitleMarginStart="@dimen/content_padding"

7
OsmAnd/res/layout/list_item_import.xml
View file

@ -23,7 +23,12 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding"
android:layout_marginEnd="@dimen/list_content_padding_large"
android:layout_marginRight="@dimen/list_content_padding_large"
android:layout_marginBottom="@dimen/content_padding"
tools:src="@drawable/ic_action_offroad" />
<LinearLayout

7
OsmAnd/res/layout/profile_data_list_item_child.xml
View file

@ -22,7 +22,12 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding"
android:layout_marginEnd="@dimen/list_content_padding_large"
android:layout_marginRight="@dimen/list_content_padding_large"
android:layout_marginBottom="@dimen/content_padding"
tools:src="@drawable/ic_action_info_dark" />
<LinearLayout

7
OsmAnd/res/layout/profile_data_list_item_group.xml
View file

@ -28,7 +28,12 @@
android:id="@+id/explist_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginTop="@dimen/content_padding"
android:layout_marginEnd="@dimen/list_content_padding_large"
android:layout_marginRight="@dimen/list_content_padding_large"
android:layout_marginBottom="@dimen/content_padding"
android:src="@drawable/ic_action_arrow_down" />
<LinearLayout

1
OsmAnd/src/net/osmand/plus/SettingsHelper.java
View file

@ -147,6 +147,7 @@ public class SettingsHelper {
SettingsItem(OsmandApplication app) {
this.app = app;
warnings = new ArrayList<>();
init();
}

2
OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
View file

@ -56,7 +56,7 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter<RecyclerView
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(app);
LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
if (viewType == HEADER_TYPE) {
View view = inflater.inflate(R.layout.list_item_header_import, parent, false);
return new HeaderViewHolder(view);