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

[Catalog] add preferences button to activity #4592

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Catalog] add preferences button to activity #4592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions catalog/java/io/material/catalog/feature/DemoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -31,6 +32,7 @@
import com.google.android.material.transition.platform.MaterialContainerTransform;
import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback;
import io.material.catalog.preferences.BaseCatalogActivity;
import io.material.catalog.preferences.CatalogPreferencesDialogFragment;
import io.material.catalog.windowpreferences.WindowPreferencesManager;

/** Base Activity class that provides a demo screen structure for a single demo. */
Expand Down Expand Up @@ -74,6 +76,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
onBackPressed();
return true;
} else if (item.getItemId() == R.id.preferences) {
new CatalogPreferencesDialogFragment().show(getSupportFragmentManager(), "preferences");
return true;
}
return super.onOptionsItemSelected(item);
}
Expand Down Expand Up @@ -141,4 +146,10 @@ private String getDefaultDemoTitle() {

public abstract View onCreateDemoView(
LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle);

@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.mtrl_preferences_menu, menu);
return true;
}
}
27 changes: 2 additions & 25 deletions catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import io.material.catalog.R;

import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.util.SparseIntArray;
import android.view.LayoutInflater;
Expand All @@ -32,24 +31,13 @@
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.button.MaterialButtonToggleGroup;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasAndroidInjector;
import dagger.android.support.AndroidSupportInjection;
import io.material.catalog.preferences.CatalogPreference.Option;
import io.material.catalog.windowpreferences.WindowPreferencesManager;
import javax.inject.Inject;

/**
* A fragment to display a bottom sheet for preferences settings.
*/
public class CatalogPreferencesDialogFragment extends BottomSheetDialogFragment
implements HasAndroidInjector {
@Inject
BaseCatalogPreferences preferences;

@Inject DispatchingAndroidInjector<Object> childFragmentInjector;

public class CatalogPreferencesDialogFragment extends BottomSheetDialogFragment {
private final SparseIntArray buttonIdToOptionId = new SparseIntArray();

@NonNull
Expand All @@ -60,17 +48,6 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
return dialog;
}

@Override
public void onAttach(Context context) {
AndroidSupportInjection.inject(this);
super.onAttach(context);
}

@Override
public AndroidInjector<Object> androidInjector() {
return childFragmentInjector;
}

@Nullable
@Override
public View onCreateView(
Expand All @@ -79,7 +56,7 @@ public View onCreateView(
@Nullable Bundle bundle) {
View container = layoutInflater.inflate(R.layout.mtrl_preferences_dialog, viewGroup, false);
LinearLayout preferencesLayout = container.findViewById(R.id.preferences_layout);
for (CatalogPreference catalogPreference : preferences.getPreferences()) {
for (CatalogPreference catalogPreference : new CatalogPreferences().getPreferences()) {
preferencesLayout.addView(
createPreferenceView(layoutInflater, preferencesLayout, catalogPreference));
}
Expand Down