TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use empty layout for activities without tabs

Browse Source
This commit is contained in:
serso
2016-02-22 09:26:39 +01:00
parent aa47871f5f
commit 1c39b2b9e8
5 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/solovyev/android/calculator/BaseActivity.java
View File

@@ -1,23 +1,24 @@
package org.solovyev.android.calculator;
import static org.solovyev.android.calculator.App.cast;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.v7.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.MenuItem;
import org.solovyev.android.calculator.view.Tabs;
import javax.annotation.Nonnull;
import static org.solovyev.android.calculator.App.cast;
public class BaseActivity extends AppCompatActivity {
@Nonnull
protected final ActivityUi ui;
public BaseActivity() {
this(R.layout.activity_empty);
this(R.layout.activity_tabs);
}
public BaseActivity(@LayoutRes int layout) {

14
app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java
View File

@@ -7,7 +7,13 @@ import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.annotation.XmlRes;
import android.util.SparseArray;
import org.solovyev.android.calculator.*;
import org.solovyev.android.calculator.ActivityUi;
import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.AppComponent;
import org.solovyev.android.calculator.BaseActivity;
import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
import org.solovyev.android.checkout.ActivityCheckout;
import org.solovyev.android.checkout.Billing;
import org.solovyev.android.checkout.Checkout;
@@ -16,8 +22,6 @@ import org.solovyev.android.checkout.Products;
import javax.annotation.Nonnull;
import javax.inject.Inject;
import static android.support.v7.app.ActionBar.NAVIGATION_MODE_STANDARD;
public class PreferencesActivity extends BaseActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
static final String EXTRA_PREFERENCE = "preference";
@@ -44,6 +48,10 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc
@Inject
Products products;
public PreferencesActivity() {
super(R.layout.activity_empty);
}
@Nonnull
static SparseArray<PrefDef> getPreferences() {
return preferences;