smaller panel flags for phone

2026-09-19 04:05:36 +00:00 · 2015-09-21 11:16:59 +02:00
parent ca71922f07
commit 34b6ca8f0a
34 changed files with 341 additions and 21 deletions
@@ -14,7 +14,7 @@
        android:top="2dp">
        <bitmap
            android:gravity="top"
-            android:src="@drawable/flag_shape_02_96dp_dark" />
+            android:src="@drawable/flag_shape_01_96dp_dark" />
    </item>

    <item
@@ -30,7 +30,7 @@
        android:top="-30dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_shape_02_outline_96dp"/>
+            android:src="@drawable/flag_shape_01_outline_96dp"/>
    </item>

 </layer-list>
@@ -14,7 +14,7 @@
        android:top="2dp">
        <bitmap
            android:gravity="top"
-            android:src="@drawable/flag_shape_02_96dp_dark" />
+            android:src="@drawable/flag_shape_01_96dp_dark" />
    </item>

    <item
@@ -30,7 +30,7 @@
        android:top="-30dp">
        <bitmap
            android:gravity="center"
-            android:src="@drawable/flag_shape_02_outline_96dp"/>
+            android:src="@drawable/flag_shape_01_outline_96dp"/>
    </item>

 </layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_november_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_november_64dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="40dp"
+        android:top="30dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_sierra_64dp"/>
+    </item>
+
+    <item
+        android:left="-35dp"
+        android:top="1dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_shape_01_64dp_dark"/>
+    </item>
+
+    <item
+        android:left="-40dp"
+        android:top="-30dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_charlie_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="40dp"
+        android:top="30dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_sierra_64dp"/>
+    </item>
+
+    <item
+        android:left="40dp"
+        android:top="30dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+    <item
+        android:left="-40dp"
+        android:top="-30dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_charlie_64dp"/>
+    </item>
+
+    <item
+        android:left="-40dp"
+        android:top="-30dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_first_blue_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_first_blue_64dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_ap_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_ap_64dp"/>
+    </item>
+
+    <item
+        android:left="0dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="40dp"
+        android:top="30dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_xray_64dp"/>
+    </item>
+
+    <item
+        android:left="-30dp"
+        android:top="0dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_04_64dp_dark"/>
+    </item>
+
+    <item
+        android:left="-40dp"
+        android:top="-30dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_first_substitute_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:left="20dp"
+        android:top="15dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_xray_64dp"/>
+    </item>
+
+    <item
+        android:left="20dp"
+        android:top="15dp">
+        <bitmap
+            android:gravity="top"
+            android:src="@drawable/flag_shape_01_outline_64dp"/>
+    </item>
+
+    <item
+        android:left="-20dp"
+        android:top="-15dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_first_substitute_64dp"/>
+    </item>
+
+    <item
+        android:left="-20dp"
+        android:top="-15dp">
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/flag_shape_04_outline_64dp"/>
+    </item>
+
+</layer-list>
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/line"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/flag"
+        android:layout_width="@dimen/flags"
+        android:layout_height="@dimen/flags"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/default_margin_half"
+        android:padding="5dp"
+        tools:src="?flag_ap_hotel_96dp" />
+
+    <ImageView
+        android:id="@+id/more_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="@dimen/default_margin"
+        android:src="@drawable/ic_chevron_right_grey600_24dp"
+        android:visibility="gone" />
+
+    <Button
+        android:id="@+id/confirm"
+        style="?attr/buttonSolidNormal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="@dimen/default_margin"
+        android:layout_toLeftOf="@id/more_data"
+        android:text="@string/set_signal"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="@dimen/default_margin"
+        android:layout_marginLeft="@dimen/default_margin_half"
+        android:layout_marginRight="@dimen/default_margin_half"
+        android:layout_marginTop="@dimen/default_margin"
+        android:layout_toLeftOf="@id/confirm"
+        android:layout_toRightOf="@id/flag"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/first_line"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?textNormal"
+            tools:text="Xray" />
+
+        <TextView
+            android:id="@+id/second_line"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?textXSmall"
+            tools:text="Individual Recall" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/thick_line"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="@dimen/default_margin_half"
+        android:layout_marginRight="@dimen/default_margin"
+        android:layout_toRightOf="@id/flag"
+        android:background="?sap_gray" />
+</RelativeLayout>
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

+    <style name="AppTheme.Dark.Flags" parent="Theme.AppCompat.NoActionBar">
+        <item name="flags_abandon">@drawable/flags_abandon_96dp_dark</item>
+        <item name="flags_course">@drawable/flags_course_96dp_dark</item>
+        <item name="flags_more">@drawable/flags_more_96dp_dark</item>
+        <item name="flags_postpone">@drawable/flags_postpone_96dp_dark</item>
+        <item name="flags_recall">@drawable/flags_recall_96dp_dark</item>
+    </style>
+
    <style name="AppTheme.Dark.Text.Header" parent="AppTheme.Dark.Text.Normal"/>

 </resources>
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

+    <style name="AppTheme.Light.Flags" parent="Theme.AppCompat.NoActionBar">
+        <item name="flags_abandon">@drawable/flags_abandon_96dp_light</item>
+        <item name="flags_course">@drawable/flags_course_96dp_light</item>
+        <item name="flags_more">@drawable/flags_more_96dp_light</item>
+        <item name="flags_postpone">@drawable/flags_postpone_96dp_light</item>
+        <item name="flags_recall">@drawable/flags_recall_96dp_light</item>
+    </style>
+
    <style name="AppTheme.Light.Text.Header" parent="AppTheme.Light.Text.Normal"/>

 </resources>
@@ -81,7 +81,7 @@
    <attr name="wind_on" format="reference"/>
    <attr name="wind_off" format="reference"/>

-    <!-- drawable drawables -->
+    <!-- flag drawables -->
    <attr name="flag_ap_alpha_96dp" format="reference"/>
    <attr name="flag_ap_hotel_96dp" format="reference"/>
    <attr name="flag_november_alpha_96dp" format="reference"/>
@@ -4,7 +4,7 @@
    <!-- Base application theme -->
    <style name="AppTheme.Dark" parent="AppTheme.Dark.Base"/>

-    <style name="AppTheme.Dark.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.Dark.Base" parent="AppTheme.Dark.Flags">
        <item name="windowActionModeOverlay">true</item>
        <item name="android:actionOverflowButtonStyle">@style/OverFlow</item>
        <item name="android:tabWidgetStyle">@style/AppTheme.Dark.TabWidget</item>
@@ -94,16 +94,18 @@
        <item name="wind_off">@drawable/wind_off_dark</item>
        <item name="wind_on">@drawable/wind_on_dark</item>

-        <!-- drawable drawable -->
        <item name="flag_ap_alpha_96dp">@drawable/flag_ap_alpha_96dp_dark</item>
        <item name="flag_ap_hotel_96dp">@drawable/flag_ap_hotel_96dp_dark</item>
        <item name="flag_november_alpha_96dp">@drawable/flag_november_alpha_96dp_dark</item>
        <item name="flag_november_hotel_96dp">@drawable/flag_november_hotel_96dp_dark</item>
-        <item name="flags_abandon">@drawable/flags_abandon_dark</item>
-        <item name="flags_course">@drawable/flags_course_dark</item>
-        <item name="flags_more">@drawable/flags_more_dark</item>
-        <item name="flags_postpone">@drawable/flags_postpone_dark</item>
-        <item name="flags_recall">@drawable/flags_recall_dark</item>
+    </style>
+
+    <style name="AppTheme.Dark.Flags" parent="Theme.AppCompat.NoActionBar">
+        <item name="flags_abandon">@drawable/flags_abandon_64dp_dark</item>
+        <item name="flags_course">@drawable/flags_course_64dp_dark</item>
+        <item name="flags_more">@drawable/flags_more_64dp_dark</item>
+        <item name="flags_postpone">@drawable/flags_postpone_64dp_dark</item>
+        <item name="flags_recall">@drawable/flags_recall_64dp_dark</item>
    </style>

    <style name="AppTheme.Dark.Widget.DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
@@ -4,7 +4,7 @@
    <!-- Base application theme -->
    <style name="AppTheme.Light" parent="AppTheme.Light.Base"/>

-    <style name="AppTheme.Light.Base" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.Light.Base" parent="AppTheme.Light.Flags">
        <item name="windowActionModeOverlay">true</item>
        <item name="android:actionOverflowButtonStyle">@style/OverFlow</item>
        <item name="android:tabWidgetStyle">@style/AppTheme.Light.TabWidget</item>
@@ -103,16 +103,18 @@
        <item name="wind_off">@drawable/wind_off_light</item>
        <item name="wind_on">@drawable/wind_on_light</item>

-        <!-- drawable drawable -->
        <item name="flag_ap_alpha_96dp">@drawable/flag_ap_alpha_96dp_light</item>
        <item name="flag_ap_hotel_96dp">@drawable/flag_ap_hotel_96dp_light</item>
        <item name="flag_november_alpha_96dp">@drawable/flag_november_alpha_96dp_light</item>
        <item name="flag_november_hotel_96dp">@drawable/flag_november_hotel_96dp_light</item>
-        <item name="flags_abandon">@drawable/flags_abandon_light</item>
-        <item name="flags_course">@drawable/flags_course_light</item>
-        <item name="flags_more">@drawable/flags_more_light</item>
-        <item name="flags_postpone">@drawable/flags_postpone_light</item>
-        <item name="flags_recall">@drawable/flags_recall_light</item>
+    </style>
+
+    <style name="AppTheme.Light.Flags" parent="Theme.AppCompat.NoActionBar">
+        <item name="flags_abandon">@drawable/flags_abandon_64dp_light</item>
+        <item name="flags_course">@drawable/flags_course_64dp_light</item>
+        <item name="flags_more">@drawable/flags_more_64dp_light</item>
+        <item name="flags_postpone">@drawable/flags_postpone_64dp_light</item>
+        <item name="flags_recall">@drawable/flags_recall_64dp_light</item>
    </style>

    <style name="AppTheme.Light.PopupMenuStyle" parent="@style/Widget.AppCompat.Light.PopupMenu">
@@ -27,7 +27,7 @@ public class FlagsResources {

        case AP:
            flag = "flag_ap_" + size + "dp";
-            outline = outline.replace("XX", "02");
+            outline = outline.replace("XX", "01");
            break;

        case BLACK:
@@ -91,7 +91,7 @@ public class FlagsResources {
            break;

        case INDIA_ZULU:
-            flag = "flag_india_zulu_" + AppPreferences.on(context).getTheme();
+            flag = "flag_india_zulu_96dp_" + AppPreferences.on(context).getTheme();
            outline = null; // because of custom xml
            break;