mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Layout compatibility 

Refs #243
This commit is contained in:
M66B 2016-01-31 16:16:24 +01:00
parent f1eaacde39
commit b8317581a0
16 changed files with 100 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/about.xml
View File

@ -23,9 +23,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
<TextView
@ -33,8 +34,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
</LinearLayout>
@ -43,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/app_copyright"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<ScrollView
android:layout_width="match_parent"
@ -70,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/app_license"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
</LinearLayout>
</ScrollView>

4
app/src/main/res/layout/access.xml
View File

@ -11,7 +11,7 @@
android:layout_width="56dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<ImageView
android:id="@+id/ivBlock"
@ -27,5 +27,5 @@
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
</LinearLayout>

1
app/src/main/res/layout/action.xml
View File

@ -9,6 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:saveEnabled="false" />
</LinearLayout>

7
app/src/main/res/layout/android.xml
View File

@ -25,9 +25,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
</LinearLayout>
@ -37,14 +38,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/app_copyright"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/app_android"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textColor="?attr/colorAccent"
android:textStyle="bold" />
</LinearLayout>

5
app/src/main/res/layout/filter.xml
View File

@ -23,9 +23,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
</LinearLayout>
@ -44,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/msg_filter"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
</LinearLayout>
</ScrollView>
</LinearLayout>

5
app/src/main/res/layout/first.xml
View File

@ -23,9 +23,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
</LinearLayout>
@ -40,6 +41,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_first"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
</ScrollView>
</LinearLayout>

24
app/src/main/res/layout/log.xml
View File

@ -16,7 +16,7 @@
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
<ImageView
@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
<ImageView
@ -39,6 +39,7 @@
android:layout_width="16dip"
android:layout_height="16dip"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp" />
<ImageView
@ -51,6 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:orientation="vertical">
@ -59,7 +61,7 @@
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
<TextView
@ -67,7 +69,7 @@
android:layout_width="40dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
</LinearLayout>
@ -75,6 +77,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_weight="1"
android:orientation="vertical">
@ -89,15 +92,16 @@
android:layout_width="36dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
<TextView
android:id="@+id/tvSAddr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
</LinearLayout>
@ -111,15 +115,16 @@
android:layout_width="36dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
<TextView
android:id="@+id/tvDAddr"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
@ -129,7 +134,8 @@
android:id="@+id/tvData"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="50dp"
android:layout_marginStart="50dp"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textSize="12sp" />
</LinearLayout>

2
app/src/main/res/layout/logview.xml
View File

@ -14,7 +14,7 @@
android:layout_marginBottom="8dp"
android:padding="8dp"
android:text="@string/msg_log_disabled"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textColor="?attr/colorOff"
android:visibility="gone" />

2
app/src/main/res/layout/main.xml
View File

@ -21,7 +21,7 @@
android:layout_marginBottom="8dp"
android:padding="8dp"
android:text="@string/msg_disabled"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textColor="?attr/colorOff"
android:visibility="gone" />

28
app/src/main/res/layout/pro.xml
View File

@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_pro_description"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
<LinearLayout
android:layout_width="match_parent"
@ -35,7 +35,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_log"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<Button
android:id="@+id/btnLog"
@ -55,7 +55,7 @@
android:layout_weight="1"
android:gravity="center_horizontal"
android:text="@string/title_pro_bought"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
@ -72,7 +72,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_filter"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<Button
android:id="@+id/btnFilter"
@ -92,7 +92,7 @@
android:layout_weight="1"
android:gravity="center_horizontal"
android:text="@string/title_pro_bought"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
@ -109,7 +109,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_notify"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<Button
android:id="@+id/btnNotify"
@ -129,7 +129,7 @@
android:layout_weight="1"
android:gravity="center_horizontal"
android:text="@string/title_pro_bought"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
@ -146,7 +146,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_speed"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<Button
android:id="@+id/btnSpeed"
@ -166,7 +166,7 @@
android:layout_weight="1"
android:gravity="center_horizontal"
android:text="@string/title_pro_bought"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
@ -183,7 +183,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_theme"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<Button
android:id="@+id/btnTheme"
@ -203,7 +203,7 @@
android:layout_weight="1"
android:gravity="center_horizontal"
android:text="@string/title_pro_bought"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone" />
</LinearLayout>
@ -219,14 +219,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/title_pro_challenge"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
<TextView
android:id="@+id/tvChallenge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_pro_challenge"
android:textAppearance="@android:style/TextAppearance.Material.Medium"
android:textAppearance="@style/TextMedium"
android:textIsSelectable="true"
android:textStyle="bold" />
@ -235,7 +235,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/title_pro_reponse"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
<EditText
android:id="@+id/etResponse"

35
app/src/main/res/layout/rule.xml
View File

@ -40,7 +40,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
</LinearLayout>
<LinearLayout
@ -52,6 +52,7 @@
<RelativeLayout
android:layout_width="24dp"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp">
<CheckBox
@ -92,6 +93,7 @@
<RelativeLayout
android:layout_width="24dp"
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp">
<CheckBox
@ -122,7 +124,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"
android:text="R"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff"
android:textSize="12dp" />
</LinearLayout>
@ -133,8 +135,10 @@
android:id="@+id/llConfiguration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:orientation="vertical"
android:paddingLeft="?android:attr/listPreferredItemHeightSmall"
android:paddingStart="?android:attr/listPreferredItemHeightSmall"
android:paddingTop="0dp"
android:visibility="gone">
@ -144,21 +148,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<TextView
android:id="@+id/tvPackage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<TextView
android:id="@+id/tvVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
<TextView
android:id="@+id/tvInternet"
@ -166,7 +170,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/title_internet"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textStyle="italic"
android:visibility="gone" />
@ -176,7 +180,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/title_disabled"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textStyle="italic"
android:visibility="gone" />
@ -185,7 +189,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_conditions"
android:textAppearance="@android:style/TextAppearance.Material.Title" />
android:textAppearance="@style/TextTitle" />
<LinearLayout
android:id="@+id/llWifiAttr"
@ -205,7 +209,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_screen_wifi"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
</LinearLayout>
<LinearLayout
@ -231,7 +235,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_screen_other"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
</LinearLayout>
<LinearLayout
@ -246,7 +250,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"
android:text="R"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff"
android:textSize="12dp" />
@ -255,7 +259,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_roaming"
android:textAppearance="@android:style/TextAppearance.Material.Small" />
android:textAppearance="@style/TextSmall" />
</LinearLayout>
</LinearLayout>
@ -275,6 +279,7 @@
android:id="@+id/btnSettings"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:src="@drawable/ic_settings_white_24dp" />
@ -282,6 +287,7 @@
android:id="@+id/btnLaunch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/title_launch" />
</LinearLayout>
@ -291,7 +297,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_access"
android:textAppearance="@android:style/TextAppearance.Material.Title" />
android:textAppearance="@style/TextTitle" />
<eu.faircode.netguard.ExpandedListView
android:id="@+id/lvAccess"
@ -304,7 +310,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/title_precedence"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textStyle="italic" />
<LinearLayout
@ -325,6 +331,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" />
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout/traffic.xml
View File

@ -20,6 +20,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:alpha="0.5"
android:text="▲"
@ -30,6 +31,7 @@
android:id="@+id/tvRx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
android:typeface="monospace" />
@ -37,6 +39,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:alpha="0.5"
android:text="▼"
@ -58,6 +61,7 @@
android:id="@+id/ivTraffic"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:scaleType="fitXY" />

7
app/src/main/res/layout/vpn.xml
View File

@ -23,9 +23,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textAppearance="@android:style/TextAppearance.Material.Large"
android:textAppearance="@style/TextLarge"
android:textStyle="bold" />
</LinearLayout>
@ -44,14 +45,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/msg_vpn"
android:textAppearance="@android:style/TextAppearance.Material.Medium" />
android:textAppearance="@style/TextMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/msg_dimming"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:textAppearance="@style/TextSmall"
android:textStyle="italic" />
</LinearLayout>
</ScrollView>

10
app/src/main/res/values-v14/styles.xml Normal file
View File

@ -0,0 +1,10 @@
<resources>
<style name="TextLarge" parent="@android:style/TextAppearance.DeviceDefault.Large" />
<style name="TextMedium" parent="@android:style/TextAppearance.DeviceDefault.Medium" />
<style name="TextSmall" parent="@android:style/TextAppearance.DeviceDefault.Small" />
<style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault.WindowTitle" />
</resources>

10
app/src/main/res/values-v21/styles.xml Normal file
View File

@ -0,0 +1,10 @@
<resources>
<style name="TextLarge" parent="@android:style/TextAppearance.Material.Large" />
<style name="TextMedium" parent="@android:style/TextAppearance.Material.Medium" />
<style name="TextSmall" parent="@android:style/TextAppearance.Material.Small" />
<style name="TextTitle" parent="@android:style/TextAppearance.Material.Title" />
</resources>

2
app/src/main/res/values/styles.xml
View File

@ -2,7 +2,7 @@
<attr name="colorOn" format="reference" />
<attr name="colorOff" format="reference" />
<attr name="expander" format="reference" />
<style name="AppThemeTeal" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorTealPrimary</item>
<item name="colorPrimaryDark">@color/colorTealPrimaryDark</item>