Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73e5acf1 authored by Isaac Katzenelson's avatar Isaac Katzenelson
Browse files

WorldClock part 2 

Bug: 7265721
Add list of cities and create an indexer.
Make data strings not translateable
Fix fast scroll issue
make cities list point to the right styles

Change-Id: I6e668f913bc951907838d18e9ab0902c87dcce41
parent 32866300

res/layout/cities_activity.xml

+3 −2
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
    android:id="@+id/cities_list"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginLeft="8dip"

    android:layout_marginRight="8dip" />
 
    android:paddingLeft="8dip"

    android:paddingRight="12dip"

    android:clipToPadding="false" />

res/layout/city_list_item.xml

+4 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:gravity="center_vertical"

    android:layout_marginLeft="8dip"

    android:layout_marginRight="8dip"

    android:paddingLeft="8dip"

    android:paddingRight="8dip"

    android:layout_height="@dimen/cities_list_item_height"

    android:orientation="horizontal">

    <LinearLayout
@@ -29,14 +29,13 @@ 
        android:orientation="vertical">

        <TextView

            android:id="@+id/city_name"

            style="city_name"

            style="@style/city_name"

            android:textColor="@color/clock_white"

            android:textAllCaps="true"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"/>

        <TextView

            android:id="@+id/city_time"

            style="city_time"

            style="@style/city_time"

            android:textColor="@color/clock_gray"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"/>

res/values/array.xml

0 → 100644
+1559 −0

File added.

Preview size limit exceeded, changes collapsed.

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
    <dimen name="medium_space">32dp</dimen>



    <dimen name="dialpad_font_size">48sp</dimen>

    <dimen name="city_name_font_size">22sp</dimen>

    <dimen name="city_name_font_size">24sp</dimen>

    <dimen name="city_time_font_size">14sp</dimen>



    <dimen name="tablet_dialpad_font_size">60sp</dimen>

res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ 
    <style name="city_name">

        <item name="android:textSize">@dimen/city_name_font_size</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:fontFamily">sans-serif</item>

        <item name="android:fontFamily">sans-serif-condensed</item>

        <item name="android:textStyle">bold</item>

    </style>



    <style name="city_time">