caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

SW remove unneeded code

Browse source
This commit is contained in:
Milos Kozak 2018-05-03 21:29:34 +02:00
parent cc532b9107
commit 02590ddd72
3 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/startupwizard/SWPlugin.java
View file

@ -42,7 +42,6 @@ public class SWPlugin extends SWItem {
ArrayList<PluginBase> pluginsInCategory = MainApp.getSpecificPluginsList(pType); ArrayList<PluginBase> pluginsInCategory = MainApp.getSpecificPluginsList(pType);
for (int row = 0; row < 1; row++) {
radioGroup.setOrientation(LinearLayout.VERTICAL); radioGroup.setOrientation(LinearLayout.VERTICAL);
radioGroup.setVisibility(View.VISIBLE); radioGroup.setVisibility(View.VISIBLE);
@ -56,7 +55,6 @@ public class SWPlugin extends SWItem {
rdbtn.setTag(p); rdbtn.setTag(p);
radioGroup.addView(rdbtn); radioGroup.addView(rdbtn);
} }
}
radioGroup.setOnCheckedChangeListener((group, checkedId) -> { radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
RadioButton rb = group.findViewById(checkedId); RadioButton rb = group.findViewById(checkedId);

6
app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
View file

@ -44,14 +44,14 @@ public class SetupWizardActivity extends AppCompatActivity {
SWScreen currentScreen = screens.get(currentWizardPage); SWScreen currentScreen = screens.get(currentWizardPage);
//Set screen name //Set screen name
screenName = (TextView) findViewById(R.id.fullscreen_content); screenName = (TextView) findViewById(R.id.sw_content);
screenName.setText(currentScreen.getHeader()); screenName.setText(currentScreen.getHeader());
//Generate layout first //Generate layout first
LinearLayout layout = SWItem.generateLayout(this.findViewById(R.id.fullscreen_content_fields)); LinearLayout layout = SWItem.generateLayout(this.findViewById(R.id.sw_content_fields));
for (int i = 0; i < currentScreen.items.size(); i++) { for (int i = 0; i < currentScreen.items.size(); i++) {
SWItem currentItem = currentScreen.items.get(i); SWItem currentItem = currentScreen.items.get(i);
currentItem.generateDialog(this.findViewById(R.id.fullscreen_content_fields), layout); currentItem.generateDialog(this.findViewById(R.id.sw_content_fields), layout);
} }
updateButtons(); updateButtons();

6
app/src/main/res/layout/activity_setupwizard.xml
View file

@ -7,7 +7,7 @@
tools:context=".startupwizard.SetupWizardActivity"> tools:context=".startupwizard.SetupWizardActivity">
<TextView <TextView
android:id="@+id/fullscreen_content" android:id="@+id/sw_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:keepScreenOn="true" android:keepScreenOn="true"
@ -21,7 +21,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:id="@+id/fullscreen_content_fields" android:id="@+id/sw_content_fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
@ -30,7 +30,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/fullscreen_content_controls" android:id="@+id/sw_content_controls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"