X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyCell.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fprivacy_cell_drawerlayout.xml;h=24fa4a5aeaddc728e11c316bc18b7af375f48403;hp=ae018c27be88ba92db4badfdf88e8754c421e241;hb=1b722c3d327fa2d571abee745a115a1f54ab2a27;hpb=189a089931502d9fc23533b5c2ffcaf98da8ed6c

diff --git a/app/src/main/res/layout/privacy_cell_drawerlayout.xml b/app/src/main/res/layout/privacy_cell_drawerlayout.xml
index ae018c2..24fa4a5 100644
--- a/app/src/main/res/layout/privacy_cell_drawerlayout.xml
+++ b/app/src/main/res/layout/privacy_cell_drawerlayout.xml
@@ -16,7 +16,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Cell.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -52,90 +52,125 @@
             <!-- The main content is wrapped in a scroll view. -->
             <ScrollView
                 android:layout_height="match_parent"
-                android:layout_width="wrap_content" >
+                android:layout_width="match_parent" >
 
                 <LinearLayout
                     android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:orientation="vertical"
                     android:padding="15dp" >
 
-                    <!-- Secure from stingray. -->
-                    <ImageView
-                        android:id="@+id/secure_from_stingray_imageview"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        tools:ignore="ContentDescription" />
-
-                    <!-- The text color primary is only displayed if the read phone state permission is not granted. -->
-                    <TextView
-                        android:id="@+id/secure_from_stingray_textview"
+                    <!-- Stingray. -->
+                    <LinearLayout
+                        android:id="@+id/stingray_linearlayout"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:layout_marginTop="10dp"
-                        android:textColor="?android:textColorPrimary"
-                        android:textSize="20sp"
-                        android:textStyle="bold" />
+                        android:orientation="vertical"
+                        tools:ignore="UseCompoundDrawables" >
+
+                        <ImageView
+                            android:id="@+id/stingray_imageview"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            tools:ignore="ContentDescription" />
+
+                        <!-- The text color primary is only displayed if the read phone state permission is not granted.
+                            The default text is replaced if the permission is not granted or the device is connected to a cell phone network. -->
+                        <TextView
+                            android:id="@+id/stingray_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:layout_marginTop="10dp"
+                            android:textColor="?android:textColorPrimary"
+                            android:textSize="20sp"
+                            android:textStyle="bold"
+                            android:text="@string/not_connected" />
+                    </LinearLayout>
 
                     <!-- Voice network. -->
-                    <TextView
-                        android:id="@+id/voice_network"
+                    <LinearLayout
+                        android:id="@+id/voice_network_linearlayout"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:layout_marginTop="30dp"
-                        android:textColor="@color/blue_text"
-                        android:textSize="18sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/voice_network_details"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:layout_marginBottom="10dp" />
+                        android:orientation="vertical" >
+
+                        <TextView
+                            android:id="@+id/voice_network"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:layout_marginTop="30dp"
+                            android:textColor="@color/blue_text"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/voice_network_details"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:layout_marginBottom="10dp" />
+                    </LinearLayout>
 
                     <!-- Data network. -->
-                    <TextView
-                        android:id="@+id/data_network"
+                    <LinearLayout
+                        android:id="@+id/data_network_linearlayout"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:textColor="@color/blue_text"
-                        android:textSize="18sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/data_network_details"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:layout_marginBottom="10dp" />
+                        android:orientation="vertical" >
+
+                        <TextView
+                            android:id="@+id/data_network"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:textColor="@color/blue_text"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/data_network_details"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:layout_marginBottom="10dp" />
+                    </LinearLayout>
 
                     <!-- Additional network info. -->
-                    <TextView
-                        android:id="@+id/additional_network_info"
-                        android:layout_height="wrap_content"
-                        android:layout_width="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:textAlignment="center"
-                        android:textColor="@color/blue_text"
-                        android:textSize="18sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/additional_network_info_details"
+                    <LinearLayout
+                        android:id="@+id/additional_network_info_linearlayout"
                         android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:textAlignment="center" />
+                        android:orientation="vertical" >
+
+                        <TextView
+                            android:id="@+id/additional_network_info"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center"
+                            android:textColor="@color/blue_text"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/additional_network_info_details"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:textAlignment="center" />
+                    </LinearLayout>
                 </LinearLayout>
             </ScrollView>
         </LinearLayout>