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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-19 18:18:12 +01:00
commit 7a4c0a6bbc
8 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -78,7 +78,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>

3
OsmAnd/res/layout-xlarge/first_usage_fragment.xml
View file

@ -9,10 +9,11 @@
android:theme="@style/OsmandLightTheme">
<ImageView
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/bg_first_usage"/>
android:background="@color/osmand_orange"/>
<LinearLayout
android:layout_width="wrap_content"

2
OsmAnd/res/layout/favorite_category_dialog_item.xml
View file

@ -11,7 +11,7 @@
android:drawableLeft="@drawable/ic_action_folder"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:text="Restaurant"
android:gravity="left|center_vertical"
android:textSize="@dimen/default_list_text_size"

3
OsmAnd/res/layout/first_usage_fragment.xml
View file

@ -9,10 +9,11 @@
android:theme="@style/OsmandLightTheme">
<ImageView
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/bg_first_usage"/>
android:background="@color/osmand_orange"/>
<LinearLayout
android:layout_width="wrap_content"

8
OsmAnd/res/layout/map_context_menu_fragment.xml
View file

@ -92,7 +92,7 @@
android:id="@+id/title_button_top_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:gravity="center"
android:paddingLeft="@dimen/context_menu_button_padding_x"
android:paddingRight="@dimen/context_menu_button_padding_x"
@ -183,7 +183,7 @@
android:id="@+id/title_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/context_menu_button_padding_x"
android:paddingRight="@dimen/context_menu_button_padding_x"
@ -206,7 +206,7 @@
android:id="@+id/title_button_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:drawableLeft="@drawable/ic_action_delete_dark"
android:gravity="center"
android:paddingLeft="@dimen/context_menu_button_padding_x"
@ -267,7 +267,7 @@
android:layout_width="@dimen/context_menu_progress_cancel_button_size"
android:layout_height="@dimen/context_menu_progress_cancel_button_size"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:scaleType="center"
tools:src="@drawable/map_action_cancel"/>

2
OsmAnd/res/layout/point_editor_fragment.xml
View file

@ -80,7 +80,7 @@
android:id="@+id/button_replace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:textColor="?attr/contextMenuButtonColor"
android:text="@string/update_existing"
android:visibility="gone"/>

7
OsmAnd/src/net/osmand/plus/FirstUsageFragment.java
View file

@ -14,6 +14,7 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.download.DownloadActivity;
@ -24,6 +25,12 @@ public class FirstUsageFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.first_usage_fragment, container, false);
ImageView backgroundImage = (ImageView) view.findViewById(R.id.background_image);
if (Build.VERSION.SDK_INT >= 14) {
backgroundImage.setImageResource(R.drawable.bg_first_usage);
} else {
backgroundImage.setImageDrawable(null);
}
final EditText editText = (EditText) view.findViewById(R.id.searchEditText);
Drawable searchIcon = ((MapActivity) getActivity()).getMyApplication().getIconsCache()
.getIcon(R.drawable.ic_action_search_dark, true);

2
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -23,7 +23,7 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.Space;
import android.support.v4.widget.Space;
import android.widget.TextView;
import android.widget.Toast;