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

Remove layout files

Browse Source
This commit is contained in:
serso
2016-02-20 13:34:55 +01:00
parent d7318bbc17
commit 07d3ebd65c
26 changed files with 59 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/solovyev/android/calculator/BaseFragment.java
View File

@@ -27,7 +27,7 @@ public abstract class BaseFragment extends Fragment {
@Nonnull
protected final FragmentUi createUi(@Nonnull FragmentTab tab) {
return new FragmentUi(tab.layout, tab.title);
return new FragmentUi(tab.layout);
}
protected void inject(@Nonnull AppComponent component) {

4
app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@@ -204,10 +204,6 @@ public class CalculatorActivity extends BaseActivity implements SharedPreference
return ViewConfiguration.get(this).hasPermanentMenuKey();
}
private boolean isMultiPane() {
return findViewById(R.id.main_second_pane) != null;
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {

2
app/src/main/java/org/solovyev/android/calculator/DisplayFragment.java
View File

@@ -96,7 +96,7 @@ public class DisplayFragment extends BaseFragment implements View.OnClickListene
@Nonnull
@Override
protected FragmentUi createUi() {
return new FragmentUi(R.layout.cpp_app_display, R.string.result);
return new FragmentUi(R.layout.cpp_app_display);
}
@Override

2
app/src/main/java/org/solovyev/android/calculator/EditorFragment.java
View File

@@ -65,7 +65,7 @@ public class EditorFragment extends BaseFragment {
@Nonnull
@Override
protected FragmentUi createUi() {
return new FragmentUi(R.layout.cpp_app_editor, R.string.editor);
return new FragmentUi(R.layout.cpp_app_editor);
}
@Override

25
app/src/main/java/org/solovyev/android/calculator/FragmentUi.java
View File

@@ -26,7 +26,6 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;
import org.solovyev.android.checkout.CppCheckout;
@@ -36,37 +35,21 @@ import org.solovyev.android.checkout.ProductTypes;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.util.Locale;
import static org.solovyev.android.calculator.App.cast;
public class FragmentUi {
private final int layoutId;
private final int titleId;
@Nullable
private Boolean adFree = null;
@Inject
CppCheckout checkout;
@Nullable
@Bind(R.id.fragment_title)
TextView fragmentTitle;
@Nullable
@Bind(R.id.admob)
AdView adView;
public FragmentUi(int layoutId) {
this(layoutId, View.NO_ID);
}
public FragmentUi(int layoutId, int titleId) {
this.layoutId = layoutId;
this.titleId = titleId;
}
public boolean isPane(@Nonnull Fragment fragment) {
return fragment.getActivity() instanceof CalculatorActivity;
}
public void onCreate(@Nonnull Fragment fragment) {
@@ -113,14 +96,6 @@ public class FragmentUi {
} else if (adView != null) {
updateAdView();
}
if (titleId != View.NO_ID && fragmentTitle != null) {
if (isPane(fragment)) {
fragmentTitle.setText(fragment.getString(titleId).toUpperCase(Locale.getDefault()));
} else {
fragmentTitle.setVisibility(View.GONE);
}
}
}
public void onDestroy() {