fix redundant layouts (from code analysis)
diff --git a/res/layout/fragment_app_store_options_list.xml b/res/layout/fragment_app_store_options_list.xml
index 0a9b7c2..1fd853b 100644
--- a/res/layout/fragment_app_store_options_list.xml
+++ b/res/layout/fragment_app_store_options_list.xml
@@ -1,23 +1,16 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/older_versions_group"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/older_versions_group"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/main_padding"
+ android:layout_weight="1"
+ android:gravity="center_horizontal"
+ android:orientation="vertical" >
- <ScrollView
- android:id="@+id/version_list_scroll"
+ <LinearLayout
+ android:id="@+id/version_list_container"
android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginTop="@dimen/main_padding"
- android:layout_weight="1"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/version_list_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:orientation="vertical" />
- </ScrollView>
-</LinearLayout>
\ No newline at end of file
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:orientation="vertical" />
+</ScrollView>
diff --git a/res/layout/fragment_other_os_options.xml b/res/layout/fragment_other_os_options.xml
index 7d69b05..1c958ea 100644
--- a/res/layout/fragment_other_os_options.xml
+++ b/res/layout/fragment_other_os_options.xml
@@ -1,57 +1,50 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
+ android:id="@+id/other_os_options_group"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/other_os_options_group"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
+ <TextView
+ style="@style/TextLight24GreyDark"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="@dimen/main_padding"
+ android:paddingRight="@dimen/main_padding"
+ android:layout_marginTop="@dimen/main_small_text_margin_top"
+ android:text="@string/important_notice"/>
+
+ <TextView
+ style="@style/TextRegular14GreyLight"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/main_button_margin_top"
+ android:paddingLeft="@dimen/main_padding"
+ android:paddingRight="@dimen/main_padding"
android:gravity="center_horizontal"
- android:orientation="vertical">
+ android:maxLines="10"
+ android:text="@string/important_notice_message"/>
- <TextView
- style="@style/TextLight24GreyDark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/main_padding"
- android:paddingRight="@dimen/main_padding"
- android:layout_marginTop="@dimen/main_small_text_margin_top"
- android:text="@string/important_notice"/>
+ <Button
+ android:id="@+id/older_fairphone_os_button"
+ style="@style/ButtonTextBackgroundBlue"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/main_small_text_margin_top"
+ android:text="@string/fairphone_os"/>
- <TextView
- style="@style/TextRegular14GreyLight"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/main_button_margin_top"
- android:paddingLeft="@dimen/main_padding"
- android:paddingRight="@dimen/main_padding"
- android:gravity="center_horizontal"
- android:maxLines="10"
- android:text="@string/important_notice_message"/>
+ <Button
+ android:id="@+id/android_os_button"
+ style="@style/ButtonTextBackgroundGreen"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/android_os"/>
- <Button
- android:id="@+id/older_fairphone_os_button"
- style="@style/ButtonTextBackgroundBlue"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/main_small_text_margin_top"
- android:text="@string/fairphone_os"/>
-
- <Button
- android:id="@+id/android_os_button"
- style="@style/ButtonTextBackgroundGreen"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/android_os"/>
-
- <Button
- android:id="@+id/app_store_install_button"
- style="@style/ButtonTextBackgroundPink"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/app_store"/>
- </LinearLayout>
-
+ <Button
+ android:id="@+id/app_store_install_button"
+ style="@style/ButtonTextBackgroundPink"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/app_store"/>
</LinearLayout>
\ No newline at end of file
diff --git a/src/com/fairphone/updater/fragments/VersionListFragment.java b/src/com/fairphone/updater/fragments/VersionListFragment.java
index 821d202..938d9c3 100644
--- a/src/com/fairphone/updater/fragments/VersionListFragment.java
+++ b/src/com/fairphone/updater/fragments/VersionListFragment.java
@@ -9,8 +9,6 @@
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
import com.fairphone.updater.FairphoneUpdater.HeaderType;
import com.fairphone.updater.R;
@@ -29,10 +27,10 @@
private ListLayoutType mListLayoutType;
private List<Version> mVersionList;
- private LinearLayout mVersionListContainer;
+ private ViewGroup mVersionListContainer;
private Button mLatestVersionDetailsButton;
- private TextView mLatestVersionInstalledIndicator;
- private LinearLayout mOlderVersionsGroup;
+ private View mLatestVersionInstalledIndicator;
+ private View mOlderVersionsGroup;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
@@ -53,8 +51,8 @@
view = inflater.inflate(R.layout.fragment_app_store_options_list, container, false);
mainActivity.updateHeader(HeaderType.APP_STORE, resources.getString(R.string.app_store), true);
- mOlderVersionsGroup = (LinearLayout) view.findViewById(R.id.older_versions_group);
- mVersionListContainer = (LinearLayout) view.findViewById(R.id.version_list_container);
+ mOlderVersionsGroup = view.findViewById(R.id.older_versions_group);
+ mVersionListContainer = (ViewGroup) view.findViewById(R.id.version_list_container);
setupAppStoreVersions(container);
break;
@@ -62,11 +60,11 @@
view = inflater.inflate(R.layout.fragment_other_os_options_android_list, container, false);
mainActivity.updateHeader(HeaderType.ANDROID, resources.getString(R.string.android_os), true);
- mOlderVersionsGroup = (LinearLayout) view.findViewById(R.id.older_versions_group);
- mVersionListContainer = (LinearLayout) view.findViewById(R.id.version_list_container);
+ mOlderVersionsGroup = view.findViewById(R.id.older_versions_group);
+ mVersionListContainer = (ViewGroup) view.findViewById(R.id.version_list_container);
mLatestVersionDetailsButton = (Button) view.findViewById(R.id.other_os_options_android_latest_version_button);
- mLatestVersionInstalledIndicator = (TextView) view.findViewById(R.id.other_os_options_android_version_installed_indicator_text);
+ mLatestVersionInstalledIndicator = view.findViewById(R.id.other_os_options_android_version_installed_indicator_text);
setupAndroidLatestVersion();
setupAndroidVersions(container);
@@ -76,11 +74,11 @@
view = inflater.inflate(R.layout.fragment_other_os_options_fairphone_list, container, false);
mainActivity.updateHeader(HeaderType.FAIRPHONE, resources.getString(R.string.fairphone_os), true);
- mOlderVersionsGroup = (LinearLayout) view.findViewById(R.id.older_versions_group);
- mVersionListContainer = (LinearLayout) view.findViewById(R.id.version_list_container);
+ mOlderVersionsGroup = view.findViewById(R.id.older_versions_group);
+ mVersionListContainer = (ViewGroup) view.findViewById(R.id.version_list_container);
mLatestVersionDetailsButton = (Button) view.findViewById(R.id.other_os_options_fairphone_latest_version_button);
- mLatestVersionInstalledIndicator = (TextView) view.findViewById(R.id.other_os_options_fairphone_version_installed_indicator_text);
+ mLatestVersionInstalledIndicator = view.findViewById(R.id.other_os_options_fairphone_version_installed_indicator_text);
setupFairphoneLatestVersion();
setupFairphoneVersions(container);