diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_list.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/layout/subscription_item.xml | 19 |
3 files changed, 24 insertions, 26 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 818b3a625..7f1d3075f 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -43,6 +43,8 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; import java.util.GregorianCalendar; import java.util.List; import java.util.concurrent.TimeUnit; @@ -748,6 +750,12 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc List<WifiConfiguration> networks = wifiservice.getConfiguredNetworks(); if (networks != null) { + Collections.sort(networks, new Comparator<WifiConfiguration>() { + @Override + public int compare(WifiConfiguration x, WifiConfiguration y) { + return x.SSID.compareTo(y.SSID); + } + }); selectedNetworks = new CheckBoxPreference[networks.size()]; List<String> prefValues = Arrays.asList(UserPreferences .getAutodownloadSelectedNetworks()); diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index 9fcf9d9fc..7e72bb39b 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,7 +1,5 @@ -<?xml version="1.0" encoding="utf-8"?> - -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<?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/nav_layout" android:layout_width="@dimen/drawer_width" @@ -23,8 +21,6 @@ android:id="@+id/imgvCover" android:layout_width="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" android:layout_marginBottom="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" android:layout_marginTop="4dp" @@ -34,8 +30,8 @@ android:padding="8dp" android:scaleType="centerCrop" android:src="?attr/ic_settings" - tools:src="@android:drawable/sym_def_app_icon" - tools:background="@android:color/holo_orange_dark" /> + tools:background="@android:color/holo_orange_dark" + tools:src="@android:drawable/sym_def_app_icon"></ImageView> <TextView android:layout_width="wrap_content" @@ -47,16 +43,15 @@ android:text="@string/settings_label" android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_navdrawer" - tools:background="@android:color/holo_green_light"/> - + tools:background="@android:color/holo_green_light" /> </LinearLayout> <View android:id="@+id/divider" android:layout_width="@dimen/drawer_width" android:layout_height="1dp" - android:layout_centerVertical="true" android:layout_above="@id/nav_settings" + android:layout_centerVertical="true" android:background="?android:attr/listDivider" tools:background="@android:color/holo_red_dark" /> @@ -64,7 +59,6 @@ android:id="@+id/nav_list" android:layout_width="@dimen/drawer_width" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_above="@id/divider" android:layout_alignParentTop="true" android:choiceMode="singleChoice" @@ -74,7 +68,6 @@ android:paddingBottom="@dimen/list_vertical_padding" android:paddingTop="@dimen/list_vertical_padding" android:scrollbarStyle="outsideOverlay" - tools:listitem="@layout/nav_listitem" - tools:background="@android:color/holo_purple" /> - + tools:background="@android:color/holo_purple" + tools:listitem="@layout/nav_listitem"></ListView> </RelativeLayout> diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index 19b9943e4..8f0539dfa 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal"> @@ -10,31 +10,28 @@ android:id="@+id/imgvCover" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" android:scaleType="centerCrop" - tools:src="@drawable/ic_launcher" /> + tools:src="@drawable/ic_launcher"> + </de.danoeh.antennapod.view.SquareImageView> <com.joanzapata.iconify.widget.IconTextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/light_gray" android:ellipsize="end" android:gravity="center" - android:background="@color/light_gray" tools:text="@string/app_name" /> <jp.shts.android.library.TriangleLabelView android:id="@+id/triangleCountView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" + android:layout_gravity="right|top" app:backgroundColor="@color/antennapod_blue" app:corner="rightTop" app:primaryText="Test" app:primaryTextColor="@color/white" - app:primaryTextSize="12sp" - android:layout_gravity="right|top"/> - + app:primaryTextSize="12sp"> + </jp.shts.android.library.TriangleLabelView> </FrameLayout> |