Add second activity to example app #37
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package com.google.android.apps.remixer; | ||
|
|
||
| import android.graphics.Color; | ||
| import android.media.Image; | ||
| import android.os.Bundle; | ||
| import android.support.v7.app.AppCompatActivity; | ||
| import android.util.TypedValue; | ||
| import android.view.View; | ||
| import android.widget.Button; | ||
| import android.widget.ImageView; | ||
| import android.widget.TextView; | ||
| import android.widget.Toast; | ||
| import com.google.android.libraries.remixer.BooleanVariableBuilder; | ||
| import com.google.android.libraries.remixer.Callback; | ||
| import com.google.android.libraries.remixer.ItemListVariable; | ||
| import com.google.android.libraries.remixer.RangeVariable; | ||
| import com.google.android.libraries.remixer.Variable; | ||
| import com.google.android.libraries.remixer.Remixer; | ||
| import com.google.android.libraries.remixer.StringVariableBuilder; | ||
| import com.google.android.libraries.remixer.Trigger; | ||
| import com.google.android.libraries.remixer.annotation.BooleanVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.IntegerListVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.RangeVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.RemixerBinder; | ||
| import com.google.android.libraries.remixer.ui.gesture.Direction; | ||
| import com.google.android.libraries.remixer.ui.view.RemixerFragment; | ||
|
|
||
| /** | ||
| * This activity reuses one of the values from variables in MainActivity. | ||
| */ | ||
| public class BoxActivity extends AppCompatActivity { | ||
|
|
||
| // A title text whose text size is set by a variable. | ||
| private TextView titleText; | ||
| // An ImageView that does nothing but draw a box with its background color. | ||
| private ImageView box; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.activity_box); | ||
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
| // Find all UI widgets | ||
| titleText = (TextView) findViewById(R.id.titleText); | ||
| box = (ImageView) findViewById(R.id.box); | ||
| // Initialize the remixer instance | ||
| RemixerBinder.bind(this); | ||
| RemixerFragment remixerFragment = RemixerFragment.newInstance(); | ||
| remixerFragment.attachToGesture(this, Direction.UP, 3); | ||
| } | ||
|
|
||
| @RangeVariableMethod( | ||
| key = "titleTextSize", title = "(Shared) title text size", | ||
| minValue = 16, maxValue = 72, increment = 4 | ||
| ) | ||
| public void setTitleTextSize(Integer size) { | ||
| titleText.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | ||
| } | ||
|
|
||
| @BooleanVariableMethod(key = "showBox", title = "Show box") | ||
| void showBox(Boolean show) { | ||
| box.setVisibility(show ? View.VISIBLE : View.GONE); | ||
| } | ||
|
|
||
| @IntegerListVariableMethod( | ||
| key = "boxColor", title = "Box color", | ||
| possibleValues = {Color.DKGRAY, Color.LTGRAY, Color.MAGENTA, Color.CYAN} | ||
| ) | ||
| void setBoxColor(Integer color) { | ||
| box.setBackgroundColor(color); | ||
| } | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,129 +1,79 @@ | ||
| /* | ||
| * Copyright 2016 Google Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.android.apps.remixer; | ||
|
|
||
| import android.os.Bundle; | ||
| import android.support.v7.app.AppCompatActivity; | ||
| import android.util.TypedValue; | ||
| import android.widget.Button; | ||
| import android.widget.TextView; | ||
| import android.widget.Toast; | ||
| import com.google.android.libraries.remixer.annotation.RangeVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.RemixerBinder; | ||
| import com.google.android.libraries.remixer.annotation.StringListVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.StringVariableMethod; | ||
| import com.google.android.libraries.remixer.annotation.TriggerMethod; | ||
| import com.google.android.libraries.remixer.ui.gesture.Direction; | ||
| import com.google.android.libraries.remixer.ui.view.RemixerFragment; | ||
|
|
||
| /** | ||
| * Example activity where remixer is used to control text size and text values. | ||
| */ | ||
| public class MainActivity extends AppCompatActivity { | ||
|
|
||
| private TextView titleText; | ||
| private TextView freeformText; | ||
| private Button remixerButton; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.activity_main); | ||
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
| titleText = (TextView) findViewById(R.id.titleText); | ||
| freeformText = (TextView) findViewById(R.id.freeformText); | ||
| remixerButton = (Button) findViewById(R.id.button); | ||
| RemixerBinder.bind(this); | ||
|
There was a problem hiding this comment. not for this PR, but: could this call be replaced with an @annotation on the Activity? There was a problem hiding this comment. It generally can't, this is because of the way Annotation processing works, all such frameworks use a similar method to tie things together :( |
||
|
|
||
| RemixerFragment remixerFragment = RemixerFragment.newInstance(); | ||
| remixerFragment.attachToGesture(this, Direction.UP, 3); | ||
| remixerFragment.attachToButton(this, remixerButton); | ||
| } | ||
|
|
||
| @RangeVariableMethod( | ||
| key = "titleTextSize", | ||
| minValue = 16, maxValue = 72, increment = 4, title = "(Shared) Title font size") | ||
| void setTitleTextSize(Integer size) { | ||
|
There was a problem hiding this comment. if I'm reading this right, then the key of an annotated method is the simple method name? And this is how you ensure this Variable is shared across 2 activities? This is really clever, but it's a really difficult to discover API. This is also prone to errors: imagine if a client has two different Activities, each with an annotated I would suggest changing it, perhaps to something more explicit. I have some ideas, but can you first enumerate the reasons why we have keys? I'll start us off:
Anything else? There was a problem hiding this comment. The key can be set explicitly, remember a while ago we were trying to minimize the amount of boilerplate a user needed to write, key was one of them, so it takes a sensible default. I can still change it to something more explicit, and maybe remove auto key generation if you think it's that problematic. Also you're correct. There was a problem hiding this comment. I think you should definitely keep an eye out for whether this trips anyone up. And/or think about when an unintended key collision happens, how you can help the client debug. All of this can be done after this PR. There was a problem hiding this comment. Curious if this param can be replaced with There was a problem hiding this comment. No, it can't :/ Java is very dumb about unboxing templated stuff. :/ There was a problem hiding this comment. Or rather, I'm checking that the parameter is of a specific class, and since templates don't work with primitives and primitives aren't classes, it's mandatory to use the boxed version, I will investigate whether there is a way to compare to the unboxed type, but I don't think that's likely. There was a problem hiding this comment. whaaat really? I think this deserves another look (later). There must be a way to support this. I think this is pretty important, or devs who add @RemixerAnnotations to existing code will find it to be a major PITA. There was a problem hiding this comment. Opened #40 to investigate |
||
| titleText.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | ||
| } | ||
|
|
||
| @StringListVariableMethod( | ||
| title = "Title text", | ||
| possibleValues = {"Hello World", "Alohomora", "Foo", "Bar", "May the force be with you"}) | ||
| void setTitleText(String text) { | ||
| titleText.setText(text); | ||
| } | ||
|
|
||
| @StringVariableMethod(defaultValue = "Change me!") | ||
| void setFreeformText(String text) { | ||
| freeformText.setText(text); | ||
| } | ||
|
|
||
| @TriggerMethod | ||
| void toast() { | ||
| Toast.makeText(this, freeformText.getText(), Toast.LENGTH_SHORT).show(); | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
formatting and blank lines for these fields