hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change RingtoneActivity to extend BaseActivity

Browse Source
This commit is contained in:
Phillip Hsu 2016-09-20 16:28:02 -07:00
parent 235e9c9d87
commit 1e1611d01d
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/philliphsu/clock2/BaseActivity.java
View File

@ -20,7 +20,10 @@ import butterknife.ButterKnife;
*/ */
public abstract class BaseActivity extends AppCompatActivity { public abstract class BaseActivity extends AppCompatActivity {
@Nullable @Bind(R.id.toolbar) Toolbar mToolbar; @Nullable
@Bind(R.id.toolbar)
Toolbar mToolbar;
private Menu mMenu; private Menu mMenu;
@LayoutRes protected abstract int layoutResId(); @LayoutRes protected abstract int layoutResId();

20
app/src/main/java/com/philliphsu/clock2/ringtone/RingtoneActivity.java
View File

@ -7,7 +7,6 @@ import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
@ -15,6 +14,7 @@ import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.philliphsu.clock2.BaseActivity;
import com.philliphsu.clock2.R; import com.philliphsu.clock2.R;
import com.philliphsu.clock2.util.LocalBroadcastHelper; import com.philliphsu.clock2.util.LocalBroadcastHelper;
@ -26,7 +26,7 @@ import butterknife.OnClick;
* An example full-screen activity that shows and hides the system UI (i.e. * An example full-screen activity that shows and hides the system UI (i.e.
* status bar and navigation/system bar) with user interaction. * status bar and navigation/system bar) with user interaction.
*/ */
public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatActivity { public abstract class RingtoneActivity<T extends Parcelable> extends BaseActivity {
private static final String TAG = "RingtoneActivity"; private static final String TAG = "RingtoneActivity";
// Shared with RingtoneService // Shared with RingtoneService
@ -84,7 +84,6 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_ringtone);
ButterKnife.bind(this); ButterKnife.bind(this);
if ((mRingingObject = getIntent().getParcelableExtra(EXTRA_RINGING_OBJECT)) == null) if ((mRingingObject = getIntent().getParcelableExtra(EXTRA_RINGING_OBJECT)) == null)
@ -179,6 +178,21 @@ public abstract class RingtoneActivity<T extends Parcelable> extends AppCompatAc
super.finish(); super.finish();
} }
@Override
protected final int layoutResId() {
return R.layout.activity_ringtone;
}
@Override
protected final int menuResId() {
return 0;
}
@Override
protected final boolean isDisplayHomeUpEnabled() {
return false;
}
public static boolean isAlive() { public static boolean isAlive() {
return sIsAlive; return sIsAlive;
} }