소스 검색

Cleanup TitleBar class a bit

Guy Carmeli 7 년 전
부모
커밋
6db371beac
1개의 변경된 파일2개의 추가작업 그리고 17개의 파일을 삭제
  1. 2
    17
      android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java

+ 2
- 17
android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java 파일 보기

4
 import android.animation.AnimatorListenerAdapter;
4
 import android.animation.AnimatorListenerAdapter;
5
 import android.app.Activity;
5
 import android.app.Activity;
6
 import android.content.Context;
6
 import android.content.Context;
7
-import android.content.ContextWrapper;
8
 import android.graphics.drawable.Drawable;
7
 import android.graphics.drawable.Drawable;
9
 import android.support.annotation.Nullable;
8
 import android.support.annotation.Nullable;
10
 import android.support.v7.widget.ActionMenuView;
9
 import android.support.v7.widget.ActionMenuView;
14
 import android.view.animation.AccelerateDecelerateInterpolator;
13
 import android.view.animation.AccelerateDecelerateInterpolator;
15
 import android.view.animation.AccelerateInterpolator;
14
 import android.view.animation.AccelerateInterpolator;
16
 import android.widget.TextView;
15
 import android.widget.TextView;
16
+
17
 import com.reactnativenavigation.params.BaseScreenParams;
17
 import com.reactnativenavigation.params.BaseScreenParams;
18
 import com.reactnativenavigation.params.BaseTitleBarButtonParams;
18
 import com.reactnativenavigation.params.BaseTitleBarButtonParams;
19
 import com.reactnativenavigation.params.StyleParams;
19
 import com.reactnativenavigation.params.StyleParams;
51
         addButtonsToTitleBar(navigatorEventId, menu);
51
         addButtonsToTitleBar(navigatorEventId, menu);
52
     }
52
     }
53
 
53
 
54
-    public int getRightButtonsWidth() {
55
-        return actionMenuView.getWidth();
56
-    }
57
-
58
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
54
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
59
                               LeftButtonOnClickListener leftButtonOnClickListener,
55
                               LeftButtonOnClickListener leftButtonOnClickListener,
60
                               String navigatorEventId,
56
                               String navigatorEventId,
95
         centerTitle(styleParams);
91
         centerTitle(styleParams);
96
     }
92
     }
97
 
93
 
98
-    private Activity getActivity() {
99
-        Context context = getContext();
100
-        while (context instanceof ContextWrapper) {
101
-            if (context instanceof Activity) {
102
-                return (Activity)context;
103
-            }
104
-            context = ((ContextWrapper)context).getBaseContext();
105
-        }
106
-        return null;
107
-    }
108
-
109
     private void centerTitle(final StyleParams params) {
94
     private void centerTitle(final StyleParams params) {
110
         final View titleView = getTitleView();
95
         final View titleView = getTitleView();
111
         if (titleView == null) {
96
         if (titleView == null) {
115
             @Override
100
             @Override
116
             public void run() {
101
             public void run() {
117
                 if (params.titleBarTitleTextCentered) {
102
                 if (params.titleBarTitleTextCentered) {
118
-                    titleView.setX(ViewUtils.getWindowWidth(getActivity()) / 2 - titleView.getWidth() / 2);
103
+                    titleView.setX(ViewUtils.getWindowWidth((Activity) getContext()) / 2 - titleView.getWidth() / 2);
119
                 }
104
                 }
120
             }
105
             }
121
         });
106
         });