diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java | 8 | ||||
| -rw-r--r-- | main/src/main/res/layout-v21/share_fab.xml (renamed from main/src/main/res/layout-v21/config_fab.xml) | 0 | ||||
| -rw-r--r-- | main/src/main/res/layout/allowed_application_layout.xml | 20 | ||||
| -rw-r--r-- | main/src/main/res/layout/share_fab.xml (renamed from main/src/main/res/layout/config_fab.xml) | 0 | ||||
| -rw-r--r-- | main/src/main/res/layout/viewconfig.xml | 2 |
5 files changed, 16 insertions, 14 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java index fe165353..ed6e9c7c 100644 --- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java +++ b/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.java @@ -43,8 +43,8 @@ public class Settings_Allowed_Apps extends Fragment { public View rootView; public TextView appName; public ImageView appIcon; - public TextView appSize; - public TextView disabled; + //public TextView appSize; + //public TextView disabled; public CheckBox checkBox; static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView) { @@ -57,8 +57,8 @@ public class Settings_Allowed_Apps extends Fragment { holder.rootView = convertView; holder.appName = (TextView) convertView.findViewById(R.id.app_name); holder.appIcon = (ImageView) convertView.findViewById(R.id.app_icon); - holder.appSize = (TextView) convertView.findViewById(R.id.app_size); - holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled); + //holder.appSize = (TextView) convertView.findViewById(R.id.app_size); + //holder.disabled = (TextView) convertView.findViewById(R.id.app_disabled); holder.checkBox = (CheckBox) convertView.findViewById(R.id.app_selected); convertView.setTag(holder); return holder; diff --git a/main/src/main/res/layout-v21/config_fab.xml b/main/src/main/res/layout-v21/share_fab.xml index 9e7e4e6c..9e7e4e6c 100644 --- a/main/src/main/res/layout-v21/config_fab.xml +++ b/main/src/main/res/layout-v21/share_fab.xml diff --git a/main/src/main/res/layout/allowed_application_layout.xml b/main/src/main/res/layout/allowed_application_layout.xml index fddfe22c..6eaaf8a3 100644 --- a/main/src/main/res/layout/allowed_application_layout.xml +++ b/main/src/main/res/layout/allowed_application_layout.xml @@ -13,16 +13,17 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingTop="8dip" android:paddingBottom="8dip" - android:columnCount="4"> + android:columnCount="4" + tools:ignore="RtlCompat"> <ImageView android:id="@+id/app_icon" android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" - android:layout_rowSpan="2" + android:layout_rowSpan="1" android:layout_marginEnd="8dip" android:scaleType="centerInside" - tools:drawable="@drawable/icon" + tools:background="@drawable/icon" android:contentDescription="@null" /> <TextView @@ -30,7 +31,8 @@ android:id="@+id/app_name" android:layout_width="0dip" android:layout_columnSpan="2" - android:layout_gravity="fill_horizontal" + android:layout_rowSpan="1" + android:layout_gravity="fill_horizontal|center_vertical" android:layout_marginTop="2dip" android:singleLine="true" android:ellipsize="marquee" @@ -40,20 +42,20 @@ <CheckBox android:id="@+id/app_selected" android:layout_marginStart="8dip" android:layout_gravity="center_vertical" - android:layout_rowSpan="2" + android:layout_rowSpan="1" android:visibility="visible" /> - <TextView +<!-- <TextView android:id="@+id/app_size" android:layout_width="0dip" android:layout_gravity="fill_horizontal|top" android:textAppearance="?android:attr/textAppearanceSmall" - android:textAlignment="viewStart" /> + android:textAlignment="viewStart" /> --> - <TextView + <!-- <TextView android:id="@+id/app_disabled" android:layout_marginStart="8dip" android:layout_gravity="top" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:textAppearance="?android:attr/textAppearanceSmall" /> --> </GridLayout>
\ No newline at end of file diff --git a/main/src/main/res/layout/config_fab.xml b/main/src/main/res/layout/share_fab.xml index c98b044d..c98b044d 100644 --- a/main/src/main/res/layout/config_fab.xml +++ b/main/src/main/res/layout/share_fab.xml diff --git a/main/src/main/res/layout/viewconfig.xml b/main/src/main/res/layout/viewconfig.xml index 9efe5bed..b73df5e5 100644 --- a/main/src/main/res/layout/viewconfig.xml +++ b/main/src/main/res/layout/viewconfig.xml @@ -19,5 +19,5 @@ android:layout_height="wrap_content" /> </ScrollView> - <include layout="@layout/config_fab" /> + <include layout="@layout/share_fab" /> </RelativeLayout>
\ No newline at end of file |