From 8258963e9241c30eef671ea14632429fa3f6f1ae Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Sat, 23 Nov 2013 12:15:16 +0100 Subject: [PATCH 1/2] finally update Twidere again! :) (to 0.2.9.3) --- metadata/org.mariotaku.twidere.txt | 11 ++++++ .../org.mariotaku.twidere/GooglePlay.patch | 34 +++++++++++++++++++ srclibs/ActionBar-PullToRefresh.txt | 7 ++++ srclibs/drag-sort-listview.txt | 7 ++++ 4 files changed, 59 insertions(+) create mode 100644 metadata/org.mariotaku.twidere/GooglePlay.patch create mode 100644 srclibs/ActionBar-PullToRefresh.txt create mode 100644 srclibs/drag-sort-listview.txt diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt index 619f054b8e..a6cf13ab75 100644 --- a/metadata/org.mariotaku.twidere.txt +++ b/metadata/org.mariotaku.twidere.txt @@ -104,6 +104,17 @@ Build:0.2.9.1,78 commit=0.2.9.1 prebuild=rm -rf dist/ art/ +Build:0.2.9.3,79 + commit=0.2.9.3 + init=rm libs/android-support-v13.jar + extlibs=android/android-support-v4.jar;android/android-support-v13.jar + srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772 + prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \ + sed -i 's@android.library.reference.4=../google-play-services_lib@@' project.properties && \ + cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \ + cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/ + patch=GooglePlay.patch + Auto Update Mode:None Update Check Mode:Tags Current Version:0.2.9.3 diff --git a/metadata/org.mariotaku.twidere/GooglePlay.patch b/metadata/org.mariotaku.twidere/GooglePlay.patch new file mode 100644 index 0000000000..5db4613b64 --- /dev/null +++ b/metadata/org.mariotaku.twidere/GooglePlay.patch @@ -0,0 +1,34 @@ +diff --git a/src/org/mariotaku/twidere/activity/MapViewerActivity.java b/src/org/mariotaku/twidere/activity/MapViewerActivity.java +index 23e9fc7..d8d5a3f 100644 +--- a/src/org/mariotaku/twidere/activity/MapViewerActivity.java ++++ b/src/org/mariotaku/twidere/activity/MapViewerActivity.java +@@ -26,13 +26,9 @@ import android.support.v4.app.FragmentTransaction; + import android.view.Menu; + import android.view.MenuItem; + +-import com.google.android.gms.common.ConnectionResult; +-import com.google.android.gms.common.GooglePlayServicesUtil; +- + import org.mariotaku.twidere.Constants; + import org.mariotaku.twidere.R; + import org.mariotaku.twidere.activity.support.TwidereSwipeBackActivity; +-import org.mariotaku.twidere.fragment.support.NativeMapFragment; + import org.mariotaku.twidere.fragment.support.WebMapFragment; + import org.mariotaku.twidere.util.MapInterface; + import org.mariotaku.twidere.util.ThemeUtils; +@@ -92,13 +88,13 @@ public class MapViewerActivity extends TwidereSwipeBackActivity implements Const + finish(); + return; + } +- final Fragment fragment = isNativeMapSupported() ? new NativeMapFragment() : new WebMapFragment(); ++ final Fragment fragment = new WebMapFragment(); + fragment.setArguments(bundle); + final FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.replace(android.R.id.content, fragment).commit(); + } + + private boolean isNativeMapSupported() { +- return GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS; ++ return false; + } + } diff --git a/srclibs/ActionBar-PullToRefresh.txt b/srclibs/ActionBar-PullToRefresh.txt new file mode 100644 index 0000000000..4eb285acc2 --- /dev/null +++ b/srclibs/ActionBar-PullToRefresh.txt @@ -0,0 +1,7 @@ +Repo Type:git +Repo:https://github.com/chrisbanes/ActionBar-PullToRefresh.git + +Subdir:library + +Update Project:Yes + diff --git a/srclibs/drag-sort-listview.txt b/srclibs/drag-sort-listview.txt new file mode 100644 index 0000000000..62449f3f57 --- /dev/null +++ b/srclibs/drag-sort-listview.txt @@ -0,0 +1,7 @@ +Repo Type:git +Repo:https://github.com/bauerca/drag-sort-listview.git + +Subdir:library + +Update Project:Yes + From b34d8d9c4d7c614bd19c583039366d00310e6e4c Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Sat, 23 Nov 2013 12:27:46 +0100 Subject: [PATCH 2/2] remove Google Play library within patch for Twidere --- metadata/org.mariotaku.twidere.txt | 1 - metadata/org.mariotaku.twidere/GooglePlay.patch | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt index a6cf13ab75..1ed553e58b 100644 --- a/metadata/org.mariotaku.twidere.txt +++ b/metadata/org.mariotaku.twidere.txt @@ -110,7 +110,6 @@ Build:0.2.9.3,79 extlibs=android/android-support-v4.jar;android/android-support-v13.jar srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772 prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \ - sed -i 's@android.library.reference.4=../google-play-services_lib@@' project.properties && \ cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \ cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/ patch=GooglePlay.patch diff --git a/metadata/org.mariotaku.twidere/GooglePlay.patch b/metadata/org.mariotaku.twidere/GooglePlay.patch index 5db4613b64..c62a06fb0b 100644 --- a/metadata/org.mariotaku.twidere/GooglePlay.patch +++ b/metadata/org.mariotaku.twidere/GooglePlay.patch @@ -1,3 +1,12 @@ +diff --git a/project.properties b/project.properties +index 79a96c4..910deaf 100644 +--- a/project.properties ++++ b/project.properties +@@ -13,4 +13,3 @@ target=android-19 + android.library.reference.1=../ActionBar-PullToRefresh + android.library.reference.2=../drag-sort-listview + android.library.reference.3=../SlidingMenu +-android.library.reference.4=../google-play-services_lib diff --git a/src/org/mariotaku/twidere/activity/MapViewerActivity.java b/src/org/mariotaku/twidere/activity/MapViewerActivity.java index 23e9fc7..d8d5a3f 100644 --- a/src/org/mariotaku/twidere/activity/MapViewerActivity.java