Projects >> android-arabic-reader >>0007571f54dbbbda8d4492e74b3eacb7ee562926

Chunk
Conflicting content
	@Override
	public void onCreate(Bundle bundle) {
		super.onCreate(bundle);
<<<<<<< HEAD
		final SimpleContainer container = new SimpleContainer(this);
		setContentView(container);
=======
		requestWindowFeature(Window.FEATURE_NO_TITLE);
		setContentView(R.layout.edit_bookmark);

		myBookmark = FBReaderIntents.getBookmarkExtra(getIntent());
		if (myBookmark == null) {
			finish();
			return;
		}

        final TabHost tabHost = (TabHost)findViewById(R.id.edit_bookmark_tabhost);
		tabHost.setup();

		final TabHost.TabSpec textSpec = tabHost.newTabSpec("text");
		textSpec.setIndicator("Text");
		textSpec.setContent(R.id.edit_bookmark_content_text);
        tabHost.addTab(textSpec);

		final TabHost.TabSpec styleSpec = tabHost.newTabSpec("style");
		styleSpec.setIndicator("Style");
		styleSpec.setContent(R.id.edit_bookmark_content_style);
        tabHost.addTab(styleSpec);

		final TabHost.TabSpec deleteSpec = tabHost.newTabSpec("delete");
		deleteSpec.setIndicator("Delete");
		deleteSpec.setContent(R.id.edit_bookmark_content_delete);
        tabHost.addTab(deleteSpec);

		final EditText editor = (EditText)findViewById(R.id.edit_bookmark_text);
		editor.setText(myBookmark.getText());
		final int len = editor.getText().length();
		editor.setSelection(len, len);

		final Button deleteButton = (Button)findViewById(R.id.edit_bookmark_delete_button);
		deleteButton.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View view) {
				myCollection.bindToService(EditBookmarkActivity.this, new Runnable() {
					public void run() {
						myCollection.deleteBookmark(myBookmark);
						finish();
					}
				});
			}
		});
	}

	@Override
	protected void onStart() {
		super.onStart();

		myCollection.bindToService(this, new Runnable() {
			public void run() {
				final List styles = myCollection.highlightingStyles();
				if (styles.isEmpty()) {
					finish();
					return;
				}
				myStylesAdapter = new StyleListAdapter(styles);
				final ListView stylesList =
					(ListView)findViewById(R.id.edit_bookmark_content_style);
				stylesList.setAdapter(myStylesAdapter);
				stylesList.setOnItemClickListener(myStylesAdapter);
				myCollection.addListener(EditBookmarkActivity.this);
			}
		});
	}

	@Override
	protected void onDestroy() {
		myCollection.unbind();
		super.onDestroy();
	}

	// method from IBookCollection.Listener
	public void onBookEvent(BookEvent event, Book book) {
		if (event == BookEvent.BookmarkStyleChanged) {
			myStylesAdapter.setStyleList(myCollection.highlightingStyles());
		}
	}

	// method from IBookCollection.Listener
	public void onBuildEvent(IBookCollection.Status status) {
	}

	private class StyleListAdapter extends BaseAdapter implements AdapterView.OnItemClickListener {
		private final List myStyles;

		StyleListAdapter(List styles) {
			myStyles = new ArrayList(styles);
		}

		public synchronized void setStyleList(List styles) {
			myStyles.clear();
			myStyles.addAll(styles);
			notifyDataSetChanged();
		}

		public final synchronized int getCount() {
			return myStyles.size();
		}

		public final synchronized HighlightingStyle getItem(int position) {
			return myStyles.get(position);
		}

		public final long getItemId(int position) {
			return position;
		}

		public final synchronized View getView(int position, View convertView, final ViewGroup parent) {
			final View view = convertView != null
				? convertView
				: LayoutInflater.from(parent.getContext()).inflate(R.layout.style_item, parent, false);
			final HighlightingStyle style = getItem(position);

			final AmbilWarnaPrefWidgetView colorView =
				(AmbilWarnaPrefWidgetView)ViewUtil.findView(view, R.id.style_item_color);
			final TextView titleView = ViewUtil.findTextView(view, R.id.style_item_title);
			final Button button = (Button)ViewUtil.findView(view, R.id.style_item_edit_button);

			final ZLResource resource = ZLResource.resource("highlightingStyleMenu");

			String name = style.getName();
			if (name == null || "".equals(name)) {
				name = resource
					.getResource("style").getValue()
					.replace("%s", String.valueOf(style.Id));
			}
			final ZLColor color = style.getBackgroundColor();
			final int rgb = color != null ? ZLAndroidColorUtil.rgb(color) : -1;

			colorView.setVisibility(View.VISIBLE);
			if (rgb != -1) {
				colorView.showCross(false);
				colorView.setBackgroundColor(rgb);
			} else {
				colorView.showCross(true);
				colorView.setBackgroundColor(0);
			}
			titleView.setText(name);

			button.setVisibility(View.VISIBLE);
			button.setText(resource.getResource("editStyle").getValue());
			button.setOnClickListener(new Button.OnClickListener() {
				@Override
				public void onClick(View view) {
					startActivity(
						new Intent(EditBookmarkActivity.this, EditStyleActivity.class)
							.putExtra(EditStyleActivity.STYLE_ID_KEY, style.Id)
					);
				}
			});

			return view;
		}

		public final synchronized void onItemClick(AdapterView parent, View view, int position, long id) {
			final HighlightingStyle style = getItem(position);
			myCollection.bindToService(EditBookmarkActivity.this, new Runnable() {
				public void run() {
					myBookmark.setStyleId(style.Id);
					myCollection.saveBookmark(myBookmark);
				}
			});
		}
>>>>>>> f3526ccc464eedba0a4521c584d8008c9df604ca
	}
}
Solution content
	@Override
	public void onCreate(Bundle bundle) {
		super.onCreate(bundle);
		requestWindowFeature(Window.FEATURE_NO_TITLE);
		setContentView(R.layout.edit_bookmark);

		myBookmark = FBReaderIntents.getBookmarkExtra(getIntent());
		if (myBookmark == null) {
			finish();
			return;
		}

        final TabHost tabHost = (TabHost)findViewById(R.id.edit_bookmark_tabhost);
		tabHost.setup();

		final TabHost.TabSpec textSpec = tabHost.newTabSpec("text");
		textSpec.setIndicator("Text");
		textSpec.setContent(R.id.edit_bookmark_content_text);
        tabHost.addTab(textSpec);

		final TabHost.TabSpec styleSpec = tabHost.newTabSpec("style");
		styleSpec.setIndicator("Style");
		styleSpec.setContent(R.id.edit_bookmark_content_style);
        tabHost.addTab(styleSpec);

		final TabHost.TabSpec deleteSpec = tabHost.newTabSpec("delete");
		deleteSpec.setIndicator("Delete");
		deleteSpec.setContent(R.id.edit_bookmark_content_delete);
        tabHost.addTab(deleteSpec);

		final EditText editor = (EditText)findViewById(R.id.edit_bookmark_text);
		editor.setText(myBookmark.getText());
		final int len = editor.getText().length();
		editor.setSelection(len, len);

		final Button deleteButton = (Button)findViewById(R.id.edit_bookmark_delete_button);
		deleteButton.setOnClickListener(new View.OnClickListener() {
			@Override
			public void onClick(View view) {
				myCollection.bindToService(EditBookmarkActivity.this, new Runnable() {
					public void run() {
						myCollection.deleteBookmark(myBookmark);
						finish();
					}
				});
			}
		});
	}

	@Override
	protected void onStart() {
		super.onStart();

			return view;
		myCollection.bindToService(this, new Runnable() {
			public void run() {
				final List styles = myCollection.highlightingStyles();
				if (styles.isEmpty()) {
					finish();
					return;
				}
				myStylesAdapter = new StyleListAdapter(styles);
				final ListView stylesList =
					(ListView)findViewById(R.id.edit_bookmark_content_style);
				stylesList.setAdapter(myStylesAdapter);
				stylesList.setOnItemClickListener(myStylesAdapter);
				myCollection.addListener(EditBookmarkActivity.this);
			}
		});
	}

	@Override
	protected void onDestroy() {
		myCollection.unbind();
		super.onDestroy();
	}

	// method from IBookCollection.Listener
	public void onBookEvent(BookEvent event, Book book) {
		if (event == BookEvent.BookmarkStyleChanged) {
			myStylesAdapter.setStyleList(myCollection.highlightingStyles());
		}
	}

	// method from IBookCollection.Listener
	public void onBuildEvent(IBookCollection.Status status) {
	}

	private class StyleListAdapter extends BaseAdapter implements AdapterView.OnItemClickListener {
		private final List myStyles;

		StyleListAdapter(List styles) {
			myStyles = new ArrayList(styles);
		}

		public synchronized void setStyleList(List styles) {
			myStyles.clear();
			myStyles.addAll(styles);
			notifyDataSetChanged();
		}

		public final synchronized int getCount() {
			return myStyles.size();
		}

		public final synchronized HighlightingStyle getItem(int position) {
			return myStyles.get(position);
		}

		public final long getItemId(int position) {
			return position;
		}

		public final synchronized View getView(int position, View convertView, final ViewGroup parent) {
			final View view = convertView != null
				? convertView
				: LayoutInflater.from(parent.getContext()).inflate(R.layout.style_item, parent, false);
			final HighlightingStyle style = getItem(position);

			final AmbilWarnaPrefWidgetView colorView =
				(AmbilWarnaPrefWidgetView)ViewUtil.findView(view, R.id.style_item_color);
			final TextView titleView = ViewUtil.findTextView(view, R.id.style_item_title);
			final Button button = (Button)ViewUtil.findView(view, R.id.style_item_edit_button);

			final ZLResource resource = ZLResource.resource("highlightingStyleMenu");

			String name = style.getName();
			if (name == null || "".equals(name)) {
				name = resource
					.getResource("style").getValue()
					.replace("%s", String.valueOf(style.Id));
			}
			final ZLColor color = style.getBackgroundColor();
			final int rgb = color != null ? ZLAndroidColorUtil.rgb(color) : -1;

			colorView.setVisibility(View.VISIBLE);
			if (rgb != -1) {
				colorView.showCross(false);
				colorView.setBackgroundColor(rgb);
			} else {
				colorView.showCross(true);
				colorView.setBackgroundColor(0);
			}
			titleView.setText(name);

			button.setVisibility(View.VISIBLE);
			button.setText(resource.getResource("editStyle").getValue());
			button.setOnClickListener(new Button.OnClickListener() {
				@Override
				public void onClick(View view) {
					startActivity(
						new Intent(EditBookmarkActivity.this, EditStyleActivity.class)
							.putExtra(EditStyleActivity.STYLE_ID_KEY, style.Id)
					);
				}
			});
		}

		public final synchronized void onItemClick(AdapterView parent, View view, int position, long id) {
			final HighlightingStyle style = getItem(position);
			myCollection.bindToService(EditBookmarkActivity.this, new Runnable() {
				public void run() {
					myBookmark.setStyleId(style.Id);
					myCollection.saveBookmark(myBookmark);
				}
			});
		}
	}
}
File
EditBookmarkActivity.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Cast expression
Class signature
Comment
If statement
Method declaration
Method invocation
Variable