Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-17964] Add custom error message for wrong theme used. #9396

Merged
merged 14 commits into from
May 19, 2018
Merged

[TIMOB-17964] Add custom error message for wrong theme used. #9396

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cbfeff4
[TIMOB-17964] Add custom error message for wrong theme used.
ypbnv Sep 4, 2017
a53e313
Merge branch 'master' into toolbar_custom_error
ypbnv Sep 4, 2017
2635f43
Merge branch 'master' into toolbar_custom_error
ypbnv Sep 7, 2017
e2d29d0
Fix message.
ypbnv Sep 7, 2017
1fb116c
Merge branch 'master' into toolbar_custom_error
ypbnv Nov 9, 2017
73dd696
Merge branch 'master' into toolbar_custom_error
ypbnv Nov 16, 2017
ca0a5b2
Merge branch 'master' into toolbar_custom_error
sgtcoolguy Nov 30, 2017
a9a18a9
Merge branch 'master' into toolbar_custom_error
ypbnv Jan 4, 2018
5165295
Fix formatting.
ypbnv Jan 4, 2018
01d8cb4
Merge branch 'master' into toolbar_custom_error
ypbnv Feb 2, 2018
5f1e3f4
Merge branch 'master' into toolbar_custom_error
ypbnv Feb 13, 2018
4ff52ef
Merge branch 'master' into toolbar_custom_error
ypbnv Feb 20, 2018
7d2718f
Merge branch 'master' into toolbar_custom_error
ypbnv Feb 22, 2018
790c139
Merge branch 'master' into toolbar_custom_error
hansemannn May 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ public abstract class TiBaseActivity extends AppCompatActivity
{
private static final String TAG = "TiBaseActivity";

private final String customToolbarExceptionMessage = "Trying to use Toolbar as ActionBar without disabling the default ActionBar in the used theme.\n" +
"Set 'windowActionBar' to false in your theme in order to do that. The following bundled themes:\n" +
"[Theme.Titanium, Theme.AppCompat.Translucent.NoTitleBar, Theme.AppCompat.NoTitleBar] are with\n" +
"disabled default ActionBar. You could use one of them.";

private static OrientationChangedListener orientationChangedListener = null;
private OrientationEventListener orientationListener;

Expand Down Expand Up @@ -752,7 +757,13 @@ public void onOrientationChanged(int orientation) {

private void setCustomActionBar() {
if (activityProxy.hasProperty(TiC.PROPERTY_SUPPORT_TOOLBAR)) {
this.setSupportActionBar(((Toolbar) ((TiToolbarProxy) activityProxy.getProperty(TiC.PROPERTY_SUPPORT_TOOLBAR)).getToolbarInstance()));
try {
this.setSupportActionBar(((Toolbar) ((TiToolbarProxy) activityProxy.getProperty(TiC.PROPERTY_SUPPORT_TOOLBAR)).getToolbarInstance()));
} catch (RuntimeException e) {
Log.e(TAG, customToolbarExceptionMessage);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the error message will only be used once, it's best to just define it here

Log.e(TAG, "Attempting to use Toolbar as ActionBar without disabling the default ActionBar in the current theme.\n" +
           "You must set 'windowActionBar' to false in your current theme. Or use one of the following themes:\n" +
           "[Theme.Titanium, Theme.AppCompat.Translucent.NoTitleBar, Theme.AppCompat.NoTitleBar]\n" +
           "Which have ActionBar disabled by default.");

I have also re-worded it 👍

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we do a list of theme instead of []? :-)

TiApplication.terminateActivityStack();
finish();
}
}
}

Expand Down