Fixed some UI elements not working

Closes #1321
M66B · Feb 12, 2014 · 8c1e724 · 8c1e724
1 parent 00cd3b4
commit 8c1e724
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Test and beta releases will have experimental functions enabled by default.
 
 **Next release**
 
+* Fixed some UI elements not working ([issue](/../../issues/1321))
 * Added reboot reasons to reboot view
 * Easier multiple select ([issue](/../../issues/1318))
 

diff --git a/res/layout/mainlist.xml b/res/layout/mainlist.xml
@@ -93,19 +93,19 @@
         </LinearLayout>
 
         <ScrollView
+            android:id="@+id/svTutorialHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/llHeader"
             android:layout_alignTop="@id/llHeader"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:visibility="gone" >
 
             <RelativeLayout
-                android:id="@+id/rlTutorialHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial"
-                android:visibility="gone" >
+                android:background="?background_tutorial" >
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -199,18 +199,18 @@
             android:scrollbarStyle="insideInset" />
 
         <ScrollView
+            android:id="@+id/svTutorialDetails"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/lvApp"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:visibility="gone" >
 
             <RelativeLayout
-                android:id="@+id/rlTutorialDetails"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial"
-                android:visibility="gone" >
+                android:background="?background_tutorial" >
 
                 <TextView
                     android:id="@+id/tvTutorialDetails"

diff --git a/res/layout/restrictionlist.xml b/res/layout/restrictionlist.xml
@@ -124,19 +124,19 @@
         </LinearLayout>
 
         <ScrollView
+            android:id="@+id/svTutorialHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/llHeader"
             android:layout_alignTop="@id/llHeader"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:visibility="gone" >
 
             <RelativeLayout
-                android:id="@+id/rlTutorialHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial"
-                android:visibility="gone" >
+                android:background="?background_tutorial" >
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -209,18 +209,18 @@
             android:scrollbarStyle="insideInset" />
 
         <ScrollView
+            android:id="@+id/svTutorialDetails"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/elvRestriction"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:visibility="gone" >
 
             <RelativeLayout
-                android:id="@+id/rlTutorialDetails"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:background="?background_tutorial"
-                android:visibility="gone" >
+                android:background="?background_tutorial" >
 
                 <TextView
                     android:id="@+id/tvTutorialDetails"

diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java
@@ -56,6 +56,7 @@
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -229,14 +230,14 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
 		// Tutorial
 		if (!PrivacyManager.getSettingBool(0, PrivacyManager.cSettingTutorialDetails, false, false)) {
-			((RelativeLayout) findViewById(R.id.rlTutorialHeader)).setVisibility(View.VISIBLE);
-			((RelativeLayout) findViewById(R.id.rlTutorialDetails)).setVisibility(View.VISIBLE);
+			((ScrollView) findViewById(R.id.svTutorialHeader)).setVisibility(View.VISIBLE);
+			((ScrollView) findViewById(R.id.svTutorialDetails)).setVisibility(View.VISIBLE);
 		}
 		View.OnClickListener listener = new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				ViewParent parent = view.getParent();
-				while (!parent.getClass().equals(RelativeLayout.class))
+				while (!parent.getClass().equals(ScrollView.class))
 					parent = parent.getParent();
 				((View) parent).setVisibility(View.GONE);
 				PrivacyManager.setSetting(0, PrivacyManager.cSettingTutorialDetails, Boolean.TRUE.toString());
@@ -431,8 +432,8 @@ private void optionHelp() {
 	}
 
 	private void optionTutorial() {
-		((RelativeLayout) findViewById(R.id.rlTutorialHeader)).setVisibility(View.VISIBLE);
-		((RelativeLayout) findViewById(R.id.rlTutorialDetails)).setVisibility(View.VISIBLE);
+		((ScrollView) findViewById(R.id.svTutorialHeader)).setVisibility(View.VISIBLE);
+		((ScrollView) findViewById(R.id.svTutorialDetails)).setVisibility(View.VISIBLE);
 		PrivacyManager.setSetting(0, PrivacyManager.cSettingTutorialDetails, Boolean.FALSE.toString());
 	}
 

diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -63,6 +63,7 @@
 import android.widget.ProgressBar;
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -271,14 +272,14 @@ public void onClick(View view) {
 
 		// Tutorial
 		if (!PrivacyManager.getSettingBool(0, PrivacyManager.cSettingTutorialMain, false, false)) {
-			((RelativeLayout) findViewById(R.id.rlTutorialHeader)).setVisibility(View.VISIBLE);
-			((RelativeLayout) findViewById(R.id.rlTutorialDetails)).setVisibility(View.VISIBLE);
+			((ScrollView) findViewById(R.id.svTutorialHeader)).setVisibility(View.VISIBLE);
+			((ScrollView) findViewById(R.id.svTutorialDetails)).setVisibility(View.VISIBLE);
 		}
 		View.OnClickListener listener = new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				ViewParent parent = view.getParent();
-				while (!parent.getClass().equals(RelativeLayout.class))
+				while (!parent.getClass().equals(ScrollView.class))
 					parent = parent.getParent();
 				((View) parent).setVisibility(View.GONE);
 				PrivacyManager.setSetting(0, PrivacyManager.cSettingTutorialMain, Boolean.TRUE.toString());
@@ -966,8 +967,8 @@ public void onClick(DialogInterface dialog, int which) {
 	}
 
 	private void optionTutorial() {
-		((RelativeLayout) findViewById(R.id.rlTutorialHeader)).setVisibility(View.VISIBLE);
-		((RelativeLayout) findViewById(R.id.rlTutorialDetails)).setVisibility(View.VISIBLE);
+		((ScrollView) findViewById(R.id.svTutorialHeader)).setVisibility(View.VISIBLE);
+		((ScrollView) findViewById(R.id.svTutorialDetails)).setVisibility(View.VISIBLE);
 		PrivacyManager.setSetting(0, PrivacyManager.cSettingTutorialMain, Boolean.FALSE.toString());
 	}