rename submodules

getlantern · May 20, 2015 · ffbca20 · ffbca20
1 parent 57371f4
commit ffbca20
Show file tree

Hide file tree

Showing 793 changed files with 4,450 additions and 4,225 deletions.
diff --git a/firetweet/build.gradle b/firetweet/build.gradle
@@ -108,8 +108,8 @@ dependencies {
     fdroidCompile 'org.osmdroid:osmdroid-android:4.3'
     fdroidCompile 'org.slf4j:slf4j-simple:1.7.12'
     debugCompile 'im.dino:dbinspector:3.1.0@aar'
-    compile project(':twidere.component.common')
-    compile project(':twidere.component.nyan')
+    compile project(':firetweet.component.common')
+    compile project(':firetweet.component.nyan')
     compile fileTree(dir: 'libs/main', include: ['*.jar'])
 //    googleCompile fileTree(dir: 'libs/google', include: ['*.jar'])
     compile('com.crashlytics.sdk.android:crashlytics:2.2.4@aar') {

diff --git a/firetweet/firetweet-fdroid-release.apk b/firetweet/firetweet-fdroid-release.apk
diff --git a/firetweet/src/androidTest/AndroidManifest.xml b/firetweet/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
   -->
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.mariotaku.twidere.test"
+          package="org.getlantern.firetweet.test"
           android:versionCode="1"
           android:versionName="1.0">
 
@@ -37,4 +37,4 @@
         android:targetPackage="org.getlantern.firetweet"
         android:label="Tests for org.getlantern.firetweet"/>
 
-</manifest>
+</manifest>
diff --git a/.../twidere/test/TwidereApplicationTest.java → ...iretweet/test/TwidereApplicationTest.java b/.../twidere/test/TwidereApplicationTest.java → ...iretweet/test/TwidereApplicationTest.java
@@ -1,8 +1,8 @@
-package org.mariotaku.twidere.test;
+package org.getlantern.firetweet.test;
 
 import android.test.ApplicationTestCase;
 
-import org.mariotaku.twidere.app.TwidereApplication;
+import org.getlantern.firetweet.app.TwidereApplication;
 
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
@@ -17,4 +17,4 @@ public TwidereApplicationTest() {
         super(TwidereApplication.class);
     }
 
-}
+}
diff --git a/firetweet/src/debug/AndroidManifest.xml b/firetweet/src/debug/AndroidManifest.xml
@@ -32,9 +32,9 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="org.mariotaku.twidere.HIDDEN_SETTINGS_ENTRY"/>
+                <action android:name="org.getlantern.firetweet.HIDDEN_SETTINGS_ENTRY"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/firetweet/src/fdroid/AndroidManifest.xml b/firetweet/src/fdroid/AndroidManifest.xml
@@ -34,8 +34,8 @@
 
                 <data
                     android:host="map"
-                    android:scheme="twidere"/>
+                    android:scheme="firetweet"/>
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/.../support/OpenStreetMapViewerActivity.java → .../support/OpenStreetMapViewerActivity.java b/.../support/OpenStreetMapViewerActivity.java → .../support/OpenStreetMapViewerActivity.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.activity.support;
+package org.getlantern.firetweet.activity.support;
 
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
@@ -28,10 +28,10 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
-import org.mariotaku.twidere.Constants;
-import org.mariotaku.twidere.R;
-import org.mariotaku.twidere.util.ParseUtils;
-import org.mariotaku.twidere.util.ThemeUtils;
+import org.getlantern.firetweet.Constants;
+import org.getlantern.firetweet.R;
+import org.getlantern.firetweet.util.ParseUtils;
+import org.getlantern.firetweet.util.ThemeUtils;
 import org.osmdroid.ResourceProxy;
 import org.osmdroid.api.IMapController;
 import org.osmdroid.api.IMapView;

diff --git a/.../util/TwitterCardFragmentFactoryImpl.java → .../util/TwitterCardFragmentFactoryImpl.java b/.../util/TwitterCardFragmentFactoryImpl.java → .../util/TwitterCardFragmentFactoryImpl.java
@@ -17,11 +17,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.util;
+package org.getlantern.firetweet.util;
 
 import android.support.v4.app.Fragment;
 
-import org.mariotaku.twidere.model.ParcelableStatus.ParcelableCardEntity;
+import org.getlantern.firetweet.model.ParcelableStatus.ParcelableCardEntity;
 
 /**
  * Created by mariotaku on 15/1/1.

diff --git a/firetweet/src/fdroid/res/drawable/ic_map_marker.xml b/firetweet/src/fdroid/res/drawable/ic_map_marker.xml
@@ -27,4 +27,4 @@
     <size
         android:width="@dimen/element_spacing_large"
         android:height="@dimen/element_spacing_large"/>
-</shape>
+</shape>
diff --git a/firetweet/src/fdroid/res/layout/activity_osm_viewer.xml b/firetweet/src/fdroid/res/layout/activity_osm_viewer.xml
@@ -27,4 +27,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tilesource="Mapnik"/>
-</merge>
+</merge>
diff --git a/firetweet/src/fdroid/res/menu/menu_osm_viewer.xml b/firetweet/src/fdroid/res/menu/menu_osm_viewer.xml
@@ -27,4 +27,4 @@
         app:showAsAction="always"
         android:title="@string/center"/>
 
-</menu>
+</menu>
diff --git a/firetweet/src/google/AndroidManifest.xml b/firetweet/src/google/AndroidManifest.xml
@@ -29,4 +29,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/...tweet/src/google/java/org/mariotaku/twidere/activity/support/GoogleMapViewerActivity.java b/...tweet/src/google/java/org/mariotaku/twidere/activity/support/GoogleMapViewerActivity.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.activity.support;
+package org.getlantern.firetweet.activity.support;
 
 import android.net.Uri;
 import android.os.Bundle;
@@ -30,13 +30,13 @@
 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.fragment.iface.IMapFragment;
-import org.mariotaku.twidere.fragment.support.GoogleMapFragment;
-import org.mariotaku.twidere.fragment.support.WebMapFragment;
-import org.mariotaku.twidere.util.ParseUtils;
-import org.mariotaku.twidere.util.ThemeUtils;
+import org.getlantern.firetweet.Constants;
+import org.getlantern.firetweet.R;
+import org.getlantern.firetweet.fragment.iface.IMapFragment;
+import org.getlantern.firetweet.fragment.support.GoogleMapFragment;
+import org.getlantern.firetweet.fragment.support.WebMapFragment;
+import org.getlantern.firetweet.util.ParseUtils;
+import org.getlantern.firetweet.util.ThemeUtils;
 
 public class GoogleMapViewerActivity extends BaseActionBarActivity implements Constants {
 

diff --git a/firetweet/src/google/java/org/mariotaku/twidere/fragment/support/GoogleMapFragment.java b/firetweet/src/google/java/org/mariotaku/twidere/fragment/support/GoogleMapFragment.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.fragment.support;
+package org.getlantern.firetweet.fragment.support;
 
 import android.os.Bundle;
 
@@ -28,8 +28,8 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import org.mariotaku.twidere.Constants;
-import org.mariotaku.twidere.fragment.iface.IMapFragment;
+import org.getlantern.firetweet.Constants;
+import org.getlantern.firetweet.fragment.iface.IMapFragment;
 
 public class GoogleMapFragment extends SupportMapFragment implements Constants, IMapFragment {
 

diff --git a/firetweet/src/google/java/org/mariotaku/twidere/fragment/support/StatusesMapFragment.java b/firetweet/src/google/java/org/mariotaku/twidere/fragment/support/StatusesMapFragment.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.fragment.support;
+package org.getlantern.firetweet.fragment.support;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -26,8 +26,8 @@
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.maps.android.clustering.ClusterManager;
 
-import org.mariotaku.twidere.model.ClusterStatus;
-import org.mariotaku.twidere.util.StatusClusterRenderer;
+import org.getlantern.firetweet.model.ClusterStatus;
+import org.getlantern.firetweet.util.StatusClusterRenderer;
 
 /**
  * Created by mariotaku on 15/1/13.

diff --git a/firetweet/src/google/java/org/mariotaku/twidere/model/ClusterStatus.java b/firetweet/src/google/java/org/mariotaku/twidere/model/ClusterStatus.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.model;
+package org.getlantern.firetweet.model;
 
 import com.google.android.gms.maps.model.LatLng;
 import com.google.maps.android.clustering.ClusterItem;

diff --git a/firetweet/src/google/java/org/mariotaku/twidere/util/StatusClusterRenderer.java b/firetweet/src/google/java/org/mariotaku/twidere/util/StatusClusterRenderer.java
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.util;
+package org.getlantern.firetweet.util;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -58,7 +58,7 @@
 import com.google.maps.android.ui.IconGenerator;
 import com.google.maps.android.ui.SquareTextView;
 
-import org.mariotaku.twidere.model.ClusterStatus;
+import org.getlantern.firetweet.model.ClusterStatus;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -944,4 +944,4 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
             marker.setPosition(position);
         }
     }
-}
+}
diff --git a/firetweet/src/google/java/org/mariotaku/twidere/util/TwitterCardFragmentFactoryImpl.java b/firetweet/src/google/java/org/mariotaku/twidere/util/TwitterCardFragmentFactoryImpl.java
@@ -17,11 +17,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mariotaku.twidere.util;
+package org.getlantern.firetweet.util;
 
 import android.support.v4.app.Fragment;
 
-import org.mariotaku.twidere.model.ParcelableStatus.ParcelableCardEntity;
+import org.getlantern.firetweet.model.ParcelableStatus.ParcelableCardEntity;
 
 /**
  * Created by mariotaku on 15/1/1.

diff --git a/firetweet/src/google/res/menu/menu_google_maps_viewer.xml b/firetweet/src/google/res/menu/menu_google_maps_viewer.xml
@@ -27,4 +27,4 @@
         app:showAsAction="always"
         android:title="@string/center"/>
 
-</menu>
+</menu>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ @@
             app:showAsAction="always"
             android:title="@string/center"/>
-    </menu>
+    </menu>