Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110687
Change subject: Use AppCompat for ActionBar everywhere
......................................................................
Use AppCompat for ActionBar everywhere
A small step towards making this work on Android 2.3 :)
Does not work yet in 2.3, though
Change-Id: I3f85b229d03870e0a690bcb6c7125d0943537334
---
M pom.xml
M wikipedia/pom.xml
M wikipedia/res/menu/menu_edit_section.xml
M wikipedia/res/menu/menu_history.xml
M wikipedia/res/menu/menu_login.xml
M wikipedia/res/menu/menu_saved_pages.xml
M wikipedia/res/menu/menu_saved_pages_context.xml
M wikipedia/res/values/styles.xml
M wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
13 files changed, 58 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/87/110687/1
diff --git a/pom.xml b/pom.xml
index b2538cd..bbcb693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,20 @@
<version>4.4_r1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v7-appcompat</artifactId>
+ <version>19.0.0</version>
+ <type>apklib</type>
+ </dependency>
+
+ <dependency>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v7-appcompat</artifactId>
+ <version>19.0.0</version>
+ <type>jar</type>
+ </dependency>
+
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android-test</artifactId>
diff --git a/wikipedia/pom.xml b/wikipedia/pom.xml
index b2d8fcc..229bf44 100644
--- a/wikipedia/pom.xml
+++ b/wikipedia/pom.xml
@@ -50,6 +50,17 @@
<artifactId>okhttp</artifactId>
<version>1.3.0</version>
</dependency>
+ <dependency>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v7-appcompat</artifactId>
+ <type>apklib</type>
+ </dependency>
+
+ <dependency>
+ <groupId>android.support</groupId>
+ <artifactId>compatibility-v7-appcompat</artifactId>
+ <type>jar</type>
+ </dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
diff --git a/wikipedia/res/menu/menu_edit_section.xml
b/wikipedia/res/menu/menu_edit_section.xml
index 30afb2d..2d76b9a 100644
--- a/wikipedia/res/menu/menu_edit_section.xml
+++ b/wikipedia/res/menu/menu_edit_section.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
+<menu xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";>
<item
android:id="@+id/menu_save_section"
android:enabled="true"
android:icon="@android:drawable/ic_menu_save"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
\ No newline at end of file
diff --git a/wikipedia/res/menu/menu_history.xml
b/wikipedia/res/menu/menu_history.xml
index 80064d6..3195fae 100644
--- a/wikipedia/res/menu/menu_history.xml
+++ b/wikipedia/res/menu/menu_history.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
+<menu xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";>
<item android:id="@+id/menu_clear_all_history"
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/menu_clear_all_history"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
\ No newline at end of file
diff --git a/wikipedia/res/menu/menu_login.xml
b/wikipedia/res/menu/menu_login.xml
index df0aa26..9d4b793 100644
--- a/wikipedia/res/menu/menu_login.xml
+++ b/wikipedia/res/menu/menu_login.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
+<menu xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";>
<item android:id="@+id/menu_login"
android:icon="@android:drawable/ic_menu_send"
android:title="@string/menu_login"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
\ No newline at end of file
diff --git a/wikipedia/res/menu/menu_saved_pages.xml
b/wikipedia/res/menu/menu_saved_pages.xml
index 4c4e6fe..fd9554b 100644
--- a/wikipedia/res/menu/menu_saved_pages.xml
+++ b/wikipedia/res/menu/menu_saved_pages.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
+<menu xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
+ >
<item android:id="@+id/menu_clear_all_saved_pages"
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/menu_clear_all_history"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
\ No newline at end of file
diff --git a/wikipedia/res/menu/menu_saved_pages_context.xml
b/wikipedia/res/menu/menu_saved_pages_context.xml
index d2ab791..a02a7bc 100644
--- a/wikipedia/res/menu/menu_saved_pages_context.xml
+++ b/wikipedia/res/menu/menu_saved_pages_context.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
+<menu xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
+ >
<item android:id="@+id/menu_delete_selected_saved_pages"
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/delete_selected_saved_pages"
- android:showAsAction="always" />
+ app:showAsAction="always" />
</menu>
\ No newline at end of file
diff --git a/wikipedia/res/values/styles.xml b/wikipedia/res/values/styles.xml
index d21427a..5e500f2 100644
--- a/wikipedia/res/values/styles.xml
+++ b/wikipedia/res/values/styles.xml
@@ -1,9 +1,5 @@
<resources>
-
- <style name="AppBaseTheme" parent="android:Theme.Light">
- </style>
-
- <style name="AppTheme" parent="AppBaseTheme">
+ <style name="AppTheme" parent="Theme.AppCompat.Light">
</style>
<style name="NoTitle" parent="AppTheme">
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
index 5db6311..184539c 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
@@ -11,6 +11,7 @@
import android.support.v4.app.LoaderManager;
import android.support.v4.content.*;
import android.support.v4.widget.CursorAdapter;
+import android.support.v7.app.ActionBarActivity;
import android.view.*;
import android.widget.*;
import com.squareup.picasso.Picasso;
@@ -22,7 +23,7 @@
import java.text.DateFormat;
import java.util.Date;
-public class HistoryActivity extends FragmentActivity implements
LoaderManager.LoaderCallbacks<Cursor> {
+public class HistoryActivity extends ActionBarActivity implements
LoaderManager.LoaderCallbacks<Cursor> {
private ListView historyEntryList;
private HistoryEntryAdapter adapter;
@@ -157,7 +158,7 @@
}
@Override
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
diff --git
a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
index 25cb2ef..4127700 100644
--- a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
@@ -17,7 +18,7 @@
import java.util.ArrayList;
import java.util.Locale;
-public class LangLinksActivity extends Activity {
+public class LangLinksActivity extends ActionBarActivity {
public static final String ACTION_LANGLINKS_FOR_TITLE =
"org.wikipedia.langlinks_for_title";
public static final String EXTRA_PAGETITLE = "org.wikipedia.pagetitle";
@@ -95,7 +96,8 @@
});
}
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
index 1e8109c..9f67287 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -2,6 +2,7 @@
import android.app.Activity;
import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
import android.text.InputType;
import android.view.Menu;
import android.view.MenuItem;
@@ -10,7 +11,7 @@
import android.widget.EditText;
import org.wikipedia.R;
-public class LoginActivity extends Activity {
+public class LoginActivity extends ActionBarActivity {
private EditText usernameText;
private EditText passwordText;
private CheckBox showPassword;
@@ -47,7 +48,7 @@
}
@Override
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 691d6a2..ce87dec 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -4,6 +4,7 @@
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarActivity;
import com.squareup.otto.Bus;
import com.squareup.otto.Subscribe;
import org.wikipedia.*;
@@ -13,7 +14,7 @@
import org.wikipedia.recurring.RecurringTasksExecutor;
import org.wikipedia.search.SearchArticlesFragment;
-public class PageActivity extends FragmentActivity {
+public class PageActivity extends ActionBarActivity {
public static final String ACTION_PAGE_FOR_TITLE =
"org.wikipedia.page_for_title";
public static final String EXTRA_PAGETITLE = "org.wikipedia.pagetitle";
public static final String EXTRA_HISTORYENTRY =
"org.wikipedia.history.historyentry";
diff --git
a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
index 376c47c..1bb5598 100644
--- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java
@@ -12,6 +12,7 @@
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.widget.CursorAdapter;
+import android.support.v7.app.ActionBarActivity;
import android.util.SparseBooleanArray;
import android.view.*;
import android.widget.*;
@@ -25,7 +26,7 @@
import java.text.DateFormat;
import java.util.Date;
-public class SavedPagesActivity extends FragmentActivity implements
LoaderManager.LoaderCallbacks<Cursor> {
+public class SavedPagesActivity extends ActionBarActivity implements
LoaderManager.LoaderCallbacks<Cursor> {
private ListView savedPagesList;
private SavedPagesAdapter adapter;
@@ -202,7 +203,7 @@
}
@Override
- public boolean onMenuItemSelected(int featureId, MenuItem item) {
+ public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
--
To view, visit https://gerrit.wikimedia.org/r/110687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f85b229d03870e0a690bcb6c7125d0943537334
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
