Skip to content

Make KickoffActivity truly transparent #495

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.

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

Merged
merged 2 commits into from
Jan 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions auth/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dependencies {
testCompile 'junit:junit:4.12'
//noinspection NewerVersionAvailable, GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.5.+'
//noinspection NewerVersionAvailable
testCompile 'org.robolectric:robolectric:3.1.4'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
Expand Down
4 changes: 2 additions & 2 deletions auth/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<activity
android:name=".KickoffActivity"
android:label="@string/default_toolbar_title"
android:exported="false"
android:theme="@style/Theme.AppCompat.NoActionBar"/>
android:label=""
android:theme="@style/FirebaseUI.Transparent"/>

<activity
android:name=".ui.email.RecoverPasswordActivity"
Expand Down
5 changes: 3 additions & 2 deletions auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import android.util.Log;

import com.firebase.ui.auth.ui.ActivityHelper;
import com.firebase.ui.auth.ui.AppCompatBase;
import com.firebase.ui.auth.ui.HelperActivityBase;
import com.firebase.ui.auth.ui.ExtraConstants;
import com.firebase.ui.auth.ui.FlowParameters;
import com.firebase.ui.auth.util.PlayServicesHelper;
import com.firebase.ui.auth.util.signincontainer.SignInDelegate;

@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public class KickoffActivity extends AppCompatBase {
public class KickoffActivity extends HelperActivityBase {
private static final String TAG = "KickoffActivity";
private static final String IS_WAITING_FOR_PLAY_SERVICES = "is_waiting_for_play_services";
private static final int RC_PLAY_SERVICES = 1;
Expand All @@ -30,6 +30,7 @@ public static Intent createIntent(Context context, FlowParameters flowParams) {
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);

if (savedInstance == null || savedInstance.getBoolean(IS_WAITING_FOR_PLAY_SERVICES)) {
if (isOffline()) {
Log.d(TAG, "No network connection");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@

@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public class ActivityHelper extends BaseHelper {
private AppCompatBase mActivity;
private HelperActivityBase mActivity;

public ActivityHelper(AppCompatBase activity, Intent intent) {
public ActivityHelper(HelperActivityBase activity, Intent intent) {
super(activity, (FlowParameters) intent.getParcelableExtra(ExtraConstants.EXTRA_FLOW_PARAMS));
mActivity = activity;
}
Expand Down
16 changes: 1 addition & 15 deletions auth/src/main/java/com/firebase/ui/auth/ui/AppCompatBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,17 @@

package com.firebase.ui.auth.ui;

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.RestrictTo;
import android.support.v7.app.AppCompatActivity;

@SuppressWarnings("Registered")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public class AppCompatBase extends AppCompatActivity {

protected ActivityHelper mActivityHelper;
public class AppCompatBase extends HelperActivityBase {

@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
mActivityHelper = new ActivityHelper(this, getIntent());
mActivityHelper.configureTheme();
}

@Override
protected void onDestroy() {
super.onDestroy();
mActivityHelper.dismissDialog();
}

public void finish(int resultCode, Intent intent) {
mActivityHelper.finish(resultCode, intent);
}
}
10 changes: 9 additions & 1 deletion auth/src/main/java/com/firebase/ui/auth/ui/BaseHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,15 @@ public void finishActivity(Activity activity, int resultCode, Intent intent) {

public void showLoadingDialog(String message) {
dismissDialog();
mProgressDialog = ProgressDialog.show(mContext, "", message, true);

if (mProgressDialog == null) {
mProgressDialog = new ProgressDialog(mContext);
mProgressDialog.setIndeterminate(true);
mProgressDialog.setTitle("");
}

mProgressDialog.setMessage(message);
mProgressDialog.show();
}

public void showLoadingDialog(@StringRes int stringResource) {
Expand Down
30 changes: 30 additions & 0 deletions auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.firebase.ui.auth.ui;

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.RestrictTo;
import android.support.v7.app.AppCompatActivity;

@SuppressWarnings("Registered")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public class HelperActivityBase extends AppCompatActivity {

protected ActivityHelper mActivityHelper;

@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
mActivityHelper = new ActivityHelper(this, getIntent());
}

@Override
protected void onDestroy() {
super.onDestroy();
mActivityHelper.dismissDialog();
}

public void finish(int resultCode, Intent intent) {
mActivityHelper.finish(resultCode, intent);
}
}

9 changes: 9 additions & 0 deletions auth/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
<item name="colorControlHighlight">@color/authui_colorAccent</item>
</style>

<style name="FirebaseUI.Transparent" parent="FirebaseUI">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
</style>

<style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog"/>

<style name="FirebaseUI.WrapperStyle">
Expand Down