Merge pull request #84 from drauggres/master

Fix memory leaks, update to Ti 7

Author: drauggres

android/dist/com.tripvi.drawerlayout-android-3.0.0.zip

@@ -1,14 +1,14 @@
-version: 2.0.0
-apiversion: 3
+version: 3.0.0
+apiversion: 4
+architectures: arm64-v8a armeabi-v7a x86
 description: Native Android DrawerLayout for Titanium
 author: metacortex, manumaticx
 license: MIT license
 copyright: Copyright (c) 2013 - 2014 by Tripvi Inc., 2015 - 2016 by Manuel Lehner
-architectures: armeabi-v7a x86
 
 # these should not be edited
 name: drawerlayout
 moduleid: com.tripvi.drawerlayout
 guid: f0a61bb9-3c4d-457f-84c7-3980a13e3dd2
 platform: android
-minsdk: 6.0.0.GA
+minsdk: 7.0.0

android/manifest

@@ -19,10 +19,10 @@
                android:layout_height="wrap_content"
                android:layout_width="match_parent"
                android:minHeight="?attr/actionBarSize"
-               android:background="@color/primary"
+               android:background="?attr/colorPrimary"
                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-               android:elevation="4dp"/>
+               android:fitsSystemWindows="true"/>
 
            <com.tripvi.drawerlayout.ContentFrame
                android:id="@+id/content_frame"

android/platform/android/res/layout/drawer_main.xml

@@ -6,6 +6,7 @@
 import android.util.AttributeSet;
 
 public class ContentFrame extends TiCompositeLayout {
+	private static final String TAG = "TripviContentFrame";
 
 	public ContentFrame(Context context) {
 		super(context);
@@ -16,7 +17,7 @@ public ContentFrame(Context context, AttributeSet set) {
 		setId(Drawer.id_content_frame);
 
 	}
-	
+
 
 
 }

android/platform/android/res/values/colors.xml

@@ -25,7 +25,6 @@
 
 public class Drawer extends TiUIView {
 
-	private DrawerLayout layout;
 	private ActionBarDrawerToggle mDrawerToggle;
 
 	private FrameLayout menu; /* left drawer */
@@ -34,6 +33,7 @@ public class Drawer extends TiUIView {
 	private int filterWidth;
 	private boolean hasMenu = false;
 	private boolean hasFilter = false;
+	private boolean setToolbar = false;
 	private boolean hasToggle = true;
 	private boolean hideToolbar = false;
 
@@ -81,14 +81,15 @@ public Drawer(final DrawerProxy proxy) {
 
 		// DrawerLayout
 		LayoutInflater inflater = LayoutInflater.from(activity);
-		layout = (DrawerLayout) inflater.inflate(layout_drawer_main, null,
+		DrawerLayout layout = (DrawerLayout) inflater.inflate(layout_drawer_main, null,
 				false);
 
 		layout.setDrawerListener(new DrawerListener());
 
 		toolbar = (Toolbar)layout.findViewById(id_toolbar);
 		// If no actionbar exists,
 		if (activity.getSupportActionBar() == null && activity.getActionBar() == null) {
+			setToolbar = true;
 			activity.setSupportActionBar(toolbar);
 			if (!hideToolbar) {
 				setToolbarVisible(true);
@@ -167,51 +168,51 @@ public void onDrawerStateChanged(int newState) {
 	 * Open/Close/Toggle drawers
 	 */
 	public void toggleLeftDrawer() {
-		if (layout.isDrawerOpen(Gravity.START)) {
+		if (((DrawerLayout)getNativeView()).isDrawerOpen(Gravity.START)) {
 			closeLeftDrawer();
 		} else {
 			openLeftDrawer();
 		}
 	}
 
 	public void openLeftDrawer() {
-		layout.openDrawer(Gravity.START);
+		((DrawerLayout) getNativeView()).openDrawer(Gravity.START);
 	}
 
 	public void closeLeftDrawer() {
-		layout.closeDrawer(Gravity.START);
+		((DrawerLayout) getNativeView()).closeDrawer(Gravity.START);
 	}
 
 	public void toggleRightDrawer() {
-		if (layout.isDrawerOpen(Gravity.END)) {
+		if (((DrawerLayout)getNativeView()).isDrawerOpen(Gravity.END)) {
 			closeRightDrawer();
 		} else {
 			openRightDrawer();
 		}
 	}
 
 	public void openRightDrawer() {
-		layout.openDrawer(Gravity.END);
+		((DrawerLayout) getNativeView()).openDrawer(Gravity.END);
 	}
 
 	public void closeRightDrawer() {
-		layout.closeDrawer(Gravity.END);
+		((DrawerLayout) getNativeView()).closeDrawer(Gravity.END);
 	}
 
 	public boolean isLeftDrawerOpen() {
-		return layout.isDrawerOpen(Gravity.START);
+		return ((DrawerLayout) getNativeView()).isDrawerOpen(Gravity.START);
 	}
 
 	public boolean isRightDrawerOpen() {
-		return layout.isDrawerOpen(Gravity.END);
+		return ((DrawerLayout) getNativeView()).isDrawerOpen(Gravity.END);
 	}
 
 	public boolean isLeftDrawerVisible() {
-		return layout.isDrawerVisible(Gravity.START);
+		return ((DrawerLayout) getNativeView()).isDrawerVisible(Gravity.START);
 	}
 
 	public boolean isRightDrawerVisible() {
-		return layout.isDrawerVisible(Gravity.END);
+		return ((DrawerLayout) getNativeView()).isDrawerVisible(Gravity.END);
 	}
 
 	private void initDrawerToggle() {
@@ -229,7 +230,7 @@ private void initDrawerToggle() {
 
 		// ActionBarDrawerToggle ties together the the proper interactions
 		// between the sliding drawer and the action bar app icon
-		mDrawerToggle = new ActionBarDrawerToggle(activity, layout,
+		mDrawerToggle = new ActionBarDrawerToggle(activity, ((DrawerLayout) getNativeView()),
 				string_drawer_open, string_drawer_close) {
 			@Override
 			public void onDrawerClosed(View drawerView) {
@@ -300,10 +301,10 @@ public void onDrawerStateChanged(int newState) {
 			}
 		};
 		// Set the drawer toggle as the DrawerListener
-		layout.setDrawerListener(mDrawerToggle);
+		((DrawerLayout) getNativeView()).setDrawerListener(mDrawerToggle);
 
 		// onPostCreate
-		layout.post(new Runnable() {
+		((DrawerLayout) getNativeView()).post(new Runnable() {
 			@Override
 			public void run() {
 				mDrawerToggle.syncState();
@@ -328,7 +329,7 @@ private void initLeftDrawer() {
 		menuLayout.gravity = Gravity.START;
 		menu.setLayoutParams(menuLayout);
 
-		layout.addView(menu);
+		((DrawerLayout) getNativeView()).addView(menu);
 
 		hasMenu = true;
 
@@ -351,7 +352,7 @@ private void initRightDrawer() {
 		filterLayout.gravity = Gravity.END;
 		filter.setLayoutParams(filterLayout);
 
-		layout.addView(filter);
+		((DrawerLayout) getNativeView()).addView(filter);
 
 		hasFilter = true;
 	}
@@ -372,7 +373,7 @@ public void replaceCenterView(TiViewProxy viewProxy) {
 		TiUIView contentView = viewProxy.getOrCreateView();
 
 		View view = contentView.getOuterView();
-		TiCompositeLayout fL = (TiCompositeLayout)layout.findViewById(id_content_frame);
+		TiCompositeLayout fL = (TiCompositeLayout)getNativeView().findViewById(id_content_frame);
 		ViewParent viewParent = view.getParent();
 		if (viewParent == null) {
 			fL.addView(view, contentView.getLayoutParams());
@@ -383,6 +384,7 @@ public void replaceCenterView(TiViewProxy viewProxy) {
 		}
 		if (this.centerView != null) {
 			fL.removeView(this.centerView.getOrCreateView().getNativeView());
+			this.centerView.releaseViews();
 		}
 		this.centerView = viewProxy;
 	}
@@ -393,9 +395,9 @@ public void setArrowState (Float state){
 
 	private void setSwipeArea (Integer width){
 		try{
-			Field mDragger = layout.getClass().getDeclaredField("mLeftDragger");
+			Field mDragger = getNativeView().getClass().getDeclaredField("mLeftDragger");
 			mDragger.setAccessible(true);
-			ViewDragHelper draggerObj = (ViewDragHelper) mDragger.get(layout);
+			ViewDragHelper draggerObj = (ViewDragHelper) mDragger.get(getNativeView());
 			Field mEdgeSize = draggerObj.getClass().getDeclaredField("mEdgeSize");
 			mEdgeSize.setAccessible(true);
 			mEdgeSize.setInt(draggerObj, width);
@@ -486,7 +488,7 @@ public void processProperties(KrollDict d) {
 			}
 		}
 		if (d.containsKey(PROPERTY_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(d
+			((DrawerLayout) getNativeView()).setDrawerLockMode(TiConvert.toInt(d
 					.get(PROPERTY_DRAWER_LOCK_MODE)));
 		}
 		if (d.containsKey(PROPERTY_HIDE_TOOLBAR)) {
@@ -607,7 +609,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue,
 			this.filter.setLayoutParams(filterLayout);
 
 		} else if (key.equals(PROPERTY_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(newValue));
+			((DrawerLayout) getNativeView()).setDrawerLockMode(TiConvert.toInt(newValue));
 		} else if (key.equals(PROPERTY_DRAWER_INDICATOR_ENABLED)) {
 			boolean b = (Boolean) newValue;
 			if (mDrawerToggle != null){
@@ -627,12 +629,49 @@ public void propertyChanged(String key, Object oldValue, Object newValue,
 		}
 	}
 
+	@Override
+	public void release() {
+		Log.d(TAG, "release");
+		DrawerLayout layout = (DrawerLayout) getNativeView();
+		if (layout != null) {
+			layout.removeAllViews();
+			layout.setDrawerListener(null);
+		}
+		if (menu != null) {
+			menu.removeAllViews();
+			menu = null;
+		}
+		if (filter != null) {
+			filter.removeAllViews();
+			filter = null;
+		}
+		if (leftView != null) {
+			leftView.releaseViews();
+			leftView = null;
+		}
+		if (rightView != null) {
+			rightView.releaseViews();
+			rightView = null;
+		}
+		if (centerView != null) {
+			centerView.releaseViews();
+			centerView = null;
+		}
+		if (setToolbar) {
+			AppCompatActivity activity = (AppCompatActivity) proxy.getActivity();
+			toolbar.removeAllViews();
+			toolbar = null;
+		}
+		super.release();
+		proxy = null;
+	}
+
 	/**
 	 * Helpers
 	 */
 	public int getDevicePixels(Object value) {
 		TiDimension nativeSize = TiConvert.toTiDimension(TiConvert.toString(value), TiDimension.TYPE_WIDTH);
-		return nativeSize.getAsPixels(layout);
+		return nativeSize.getAsPixels(getNativeView());
 	}
 
 	private View getNativeView(TiViewProxy viewProxy) {