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

Use LinearLayout parameters

Browse Source
This commit is contained in:
serso 2016-04-09 21:42:28 +02:00
parent 29d4d77831
commit b85d7d1658
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java
View File

@ -36,24 +36,18 @@ import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.EditText; import android.widget.*;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.App; import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.Preferences; import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R; import org.solovyev.android.calculator.R;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
@ -115,7 +109,7 @@ public class FunctionParamsView extends LinearLayout {
}); });
headerView.addView(addButton, makeButtonParams()); headerView.addView(addButton, makeButtonParams());
headerView.addView(new View(context), new LayoutParams(3 * clickableAreaSize, WRAP_CONTENT)); headerView.addView(new View(context), new LayoutParams(3 * clickableAreaSize, WRAP_CONTENT));
addView(headerView, new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); addView(headerView, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
} }
@Nullable @Nullable
@ -206,7 +200,7 @@ public class FunctionParamsView extends LinearLayout {
rowView.addView(paramLabel, new LayoutParams(0, WRAP_CONTENT, 1)); rowView.addView(paramLabel, new LayoutParams(0, WRAP_CONTENT, 1));
// for row is added at 0 position, the consequent rows // for row is added at 0 position, the consequent rows
addView(rowView, Math.max(0, getChildCount() - 1), new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)); addView(rowView, Math.max(0, getChildCount() - 1), new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
onParamsChanged(); onParamsChanged();
return rowView; return rowView;
} }