添加时区选择

.idea/misc.xml

@@ -3,23 +3,28 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="app/src/main/res/drawable-xhdpi/button_shape.xml" value="0.131" />
         <entry key="app/src/main/res/layout-v28/activity_pin.xml" value="0.3374094202898551" />
         <entry key="app/src/main/res/layout/activity_congratulation.xml" value="0.75" />
         <entry key="app/src/main/res/layout/activity_esim_activation.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_input_pin.xml" value="0.335" />
         <entry key="app/src/main/res/layout/activity_install_sim.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_list.xml" value="0.14387031408308004" />
+        <entry key="app/src/main/res/layout/activity_list_title_center.xml" value="0.365036231884058" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_pin.xml" value="1.0" />
         <entry key="app/src/main/res/layout/activity_qr.xml" value="0.15932117527862208" />
         <entry key="app/src/main/res/layout/activity_sim_install.xml" value="0.75" />
         <entry key="app/src/main/res/layout/activity_sim_locked.xml" value="0.11" />
         <entry key="app/src/main/res/layout/activity_sim_unlocked.xml" value="0.21014492753623187" />
+        <entry key="app/src/main/res/layout/activity_timeformat.xml" value="0.1816123188405797" />
         <entry key="app/src/main/res/layout/activity_unlocked.xml" value="0.3098958333333333" />
         <entry key="app/src/main/res/layout/activity_welcome.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_wifi_login.xml" value="0.10869565217391304" />
         <entry key="app/src/main/res/layout/content_main.xml" value="0.19300911854103345" />
         <entry key="app/src/main/res/layout/item_checkbox.xml" value="0.14387031408308004" />
+        <entry key="app/src/main/res/layout/item_timeformat.xml" value="0.365036231884058" />
+        <entry key="app/src/main/res/layout/item_title_center.xml" value="0.1889564336372847" />
         <entry key="app/src/main/res/layout/view_empty.xml" value="0.1" />
         <entry key="app/src/main/res/menu/menu_main.xml" value="0.1" />
       </map>

app/src/main/AndroidManifest.xml

@@ -42,6 +42,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".Activity.TimeFormatActivity"
+            android:exported="true"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
         <activity
             android:name=".Activity.WelcomeActivity"
             android:exported="true"

app/src/main/java/com/xplora/xponboarding/Activity/OnboardingActivity.java

@@ -91,7 +91,7 @@ public class OnboardingActivity extends BaseActivatedActivity {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(OnboardingActivity.this, WelcomeActivity.class);
+                Intent intent = new Intent(OnboardingActivity.this, TimeFormatActivity.class);
                 startActivity(intent);
                 finish();
             }

app/src/main/java/com/xplora/xponboarding/Activity/TimeFormatActivity.java

@@ -0,0 +1,94 @@
+package com.xplora.xponboarding.Activity;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.ListView;
+
+import com.xplora.xponboarding.Adapter.BaseListAdapter;
+import com.xplora.xponboarding.Data.DataManager;
+import com.xplora.xponboarding.Model.BaseModel;
+import com.xplora.xponboarding.R;
+import com.xplora.xponboarding.Utils.Constant;
+import com.xplora.xponboarding.Utils.ToolsUtils;
+
+public class TimeFormatActivity extends BaseActivatedActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_timeformat);
+        isLockKey = true;
+
+        initData();
+        initView();
+        initConfirmButton();
+    }
+
+    private void initData() {
+        String timeFormat = DataManager.getTimeFormat();
+        int index = timeFormat.equals("12") ? 0 : 1;
+        String[] timeArray = ToolsUtils.getTimeFormatString(index);
+        String[] stringList = getResources().getStringArray(R.array.timeformat_titls_array);
+        for (int i = 0; i < 3; i++) {
+            if (i == 0) {
+                BaseModel model = new BaseModel();
+                model.title = timeArray[0];
+                model.subTitle = timeArray[1];
+                model.cellType = Constant.CellType.TIMEFORMAT;
+                mDataList.add(model);
+            } else {
+                BaseModel model = new BaseModel();
+                model.title = stringList[i-1].trim();
+                model.isOn = i == (index+1);
+                model.titileColor = R.color.xp_yellow;
+                model.cellType = Constant.CellType.CHECKBOX;
+                mDataList.add(model);
+            }
+        }
+    }
+
+    private void initView() {
+        mAdapter = new BaseListAdapter(this, 0, mDataList);
+        ListView listView = findViewById(R.id.activity_listview);
+        listView.setAdapter(mAdapter);
+        listView.setDivider(new ColorDrawable(Color.TRANSPARENT));
+        listView.setDividerHeight(1);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (position <= 0)
+                    return;
+
+                changeTimeFormat(position-1);
+
+                mDataList.clear();
+                initData();
+                mAdapter.setBaseObjects(mDataList);
+                mAdapter.notifyDataSetInvalidated();
+            }
+        });
+    }
+
+    private void initConfirmButton() {
+        Button button = findViewById(R.id.button);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(TimeFormatActivity.this, WelcomeActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        });
+    }
+
+    private void changeTimeFormat(int index) {
+        DataManager.setTimeFormat(index == 0 ? Constant.TIMEFORMAT_12 : Constant.TIMEFORMAT_24);
+        Intent intent=new Intent("action.update.clockformat");
+        intent.setPackage("com.android.systemui");
+        sendBroadcast(intent);
+    }
+}

app/src/main/java/com/xplora/xponboarding/Adapter/BaseListAdapter.java

@@ -41,16 +41,26 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
         View view = null;
         if (model.cellType == Constant.CellType.CHECKBOX) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_checkbox, null);
+        } else if (model.cellType == Constant.CellType.TIMEFORMAT) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_timeformat, null);
         } else if (model.cellType == Constant.CellType.EMPTY) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.view_empty, null);
         }
 
         assert view != null;
         TextView itemTitle = view.findViewById(R.id.item_title);
+        TextView itemSubTitle = view.findViewById(R.id.item_subTitle);
         CheckBox checkboxButton = view.findViewById(R.id.item_checkbox);
 
         if (itemTitle != null) {
             itemTitle.setText(model.title);
+            if (model.isOn && model.titileColor != 0) {
+                itemTitle.setTextColor(getContext().getColor(model.titileColor));
+            }
+        }
+
+        if (itemSubTitle != null) {
+            itemSubTitle.setText(model.subTitle);
         }
 
         if (checkboxButton != null) {

app/src/main/java/com/xplora/xponboarding/Data/DataManager.java

@@ -12,6 +12,7 @@ import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.android.internal.app.LocalePicker;
+import com.xplora.xponboarding.Utils.Constant;
 import com.xplora.xponboarding.Utils.Macros;
 
 import java.util.ArrayList;
@@ -20,6 +21,7 @@ import java.util.Locale;
 
 public class DataManager extends Application {
     public static String TAG = "losion / xponboarding :" + "DataManager";
+    public static String mTimeFormat = Constant.TIMEFORMAT_12;
 
     @SuppressLint("StaticFieldLeak")
     private static Context sContext;
@@ -30,6 +32,26 @@ public class DataManager extends Application {
         sContext = getApplicationContext();
     }
 
+    public static String getTimeFormat() {
+        if (Macros.DEBUG) {
+            return mTimeFormat;
+        }
+        String format = Settings.System.getString(sContext.getContentResolver(), Settings.System.TIME_12_24);
+        if (format == null || format.equals("")) {
+            format = Constant.TIMEFORMAT_12;
+            setTimeFormat(format);
+        }
+        return format;
+    }
+
+    public static void setTimeFormat(String format) {
+        if (Macros.DEBUG) {
+            mTimeFormat = format;
+            return;
+        }
+        Settings.System.putString(sContext.getContentResolver(), Settings.System.TIME_12_24, format);
+    }
+
     //是否有 sim 卡
     public static boolean isSimAbsent() {
         TelephonyManager tm = (TelephonyManager) sContext.getSystemService(TELEPHONY_SERVICE);//取得相关系统服务

app/src/main/java/com/xplora/xponboarding/Model/BaseModel.java

@@ -12,4 +12,5 @@ public class BaseModel {
     public boolean isShowArrow = true;
     public boolean isOn = false;
     public int subColor = 0;
+    public int titileColor = 0;
 }

app/src/main/java/com/xplora/xponboarding/Utils/Constant.java

@@ -16,6 +16,9 @@ public class Constant {
     public static final int MSG_SURE_CLICK = 3;
     public static final int MSG_TEXTEDIT_FINISH = 4;
 
+    public static String TIMEFORMAT_12 = "12";
+    public static String TIMEFORMAT_24 = "24";
+
     public enum CellType {
         TITLE,
         TITLE_SUBTITLE,
@@ -32,6 +35,7 @@ public class Constant {
         CANCEL_SURE,
         SURE,
         MESSAGE,
+        TIMEFORMAT,
         EMPTY,
     }
 

app/src/main/java/com/xplora/xponboarding/Utils/ToolsUtils.java

@@ -0,0 +1,47 @@
+package com.xplora.xponboarding.Utils;
+
+import android.annotation.SuppressLint;
+
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+
+public class ToolsUtils {
+    public static String TAG = "losion / xplauncher :" + "ToolsUtils";
+
+    public static int getCurrentTimeSecond() {
+        long time = System.currentTimeMillis() / 1000;
+        int curTime = (int) time;
+        return curTime;
+    }
+
+    public static long getCurrentTimeMillis() {
+        return System.currentTimeMillis();
+    }
+
+    public static int getSecond() {
+        long time = getCurrentTimeMillis();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        return calendar.get(Calendar.SECOND);
+    }
+
+    public static int[] getHourMinute() {
+        long time = getCurrentTimeMillis();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(time);
+        int hour = calendar.get(Calendar.HOUR_OF_DAY);
+        int miniute = calendar.get(Calendar.MINUTE);
+        return new int[]{hour, miniute};
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    public static String[] getTimeFormatString(int timeFormat) {
+        long time = getCurrentTimeMillis();
+        String format = timeFormat >= 1 ? "HH:mm; " : "hh:mm;a";
+        SimpleDateFormat dataFormat = new SimpleDateFormat(format,  Locale.getDefault());
+        String ret = dataFormat.format(new Date(time));
+        return ret.split(";");
+    }
+}

app/src/main/res/drawable-xhdpi/button_shape.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="#FF262626" />
+
+    <!-- 圆角的半径 -->
+    <corners android:radius="10dp" />
+</shape>

app/src/main/res/layout/activity_timeformat.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    >
+
+    <ListView
+        android:id="@+id/activity_listview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="18dp"
+        android:scrollbarThumbVertical="@color/xp_yellow"
+        >
+    </ListView>
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="80dp"
+        android:layout_height="28dp"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="20dp"
+        android:textSize="12sp"
+        android:textFontWeight="400"
+        android:textColor="#FFFFFFFF"
+        android:fontFamily="Roboto"
+        android:text="@string/confirm"
+        android:backgroundTint="@color/xp_green"
+        style="@style/xp_style_button_all"
+        />
+
+</RelativeLayout>

app/src/main/res/layout/item_timeformat.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="47dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="2dp"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:background="@drawable/button_shape"
+        >
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="29dp"
+            >
+            <TextView
+                android:id="@+id/item_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_centerHorizontal="true"
+                android:textAlignment="center"
+                android:fontFamily="Roboto"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/item_subTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toEndOf="@id/item_title"
+                android:layout_alignBottom="@+id/item_title"
+                android:layout_marginBottom="2dp"
+                android:layout_marginStart="2dp"
+                android:textAlignment="center"
+                android:fontFamily="Roboto"
+                android:textStyle="bold"
+                android:textColor="@color/white"
+                android:textSize="10sp"
+                />
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#33FFFFFF"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:fontFamily="Roboto"
+            android:textColor="#E85EFF"
+            android:textSize="9sp"
+            android:text="@string/timeformat_hint"
+            />
+    </LinearLayout>
+
+</RelativeLayout>

app/src/main/res/values-b+sr+Latn/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-satni format</item>
+        <item>24-satni format</item>
+    </string-array>
+</resources>

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Prvo instaliraj SIM karticu</string>
     <string name="restart">Pokreni ponovo</string>
     <string name="sim_input_error_3">Uneli ste pogrešan pin \n kod 3 putа, \n koristite telefon da otključate SIM karticu.</string>
+    <string name="timeformat_hint">Ово је пример времена</string>
 </resources>

app/src/main/res/values-da/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 timers format</item>
+        <item>24 timers format</item>
+    </string-array>
+</resources>

app/src/main/res/values-da/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Installér \nSIM-kortet først</string>
     <string name="restart">Genstart</string>
     <string name="sim_input_error_3">Du har indtastet forkert PIN-kode 3 gange, \n brug venligst din telefon til at låse SIM-kortet op.</string>
+    <string name="timeformat_hint">Dette er et eksempel på tid</string>
 </resources>

app/src/main/res/values-de/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-Stunden-Format</item>
+        <item>24-Stunden-Format</item>
+    </string-array>
+</resources>

app/src/main/res/values-de/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Bitte lege zuerst die SIM-Karte ein</string>
     <string name="restart">Neu starten</string>
     <string name="sim_input_error_3">Du hast dreimal einen falschen PIN-Code \n eingegeben, \n bitte verwende dein Mobiltelefon, um die SIM-Karte zu entsperren.</string>
+    <string name="timeformat_hint">Dies ist eine Beispielzeit</string>
 </resources>

app/src/main/res/values-es/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 horas</item>
+        <item>24 horas</item>
+    </string-array>
+</resources>

app/src/main/res/values-es/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Primero, instala la tarjeta SIM.</string>
     <string name="restart">Reiniciar</string>
     <string name="sim_input_error_3">Has introducido un código PIN incorrecto \n 3 veces, \n usa tu teléfono para desbloquear la tarjeta SIM.</string>
+    <string name="timeformat_hint">Este es un ejemplo de tiempo</string>
 </resources>

app/src/main/res/values-et/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-tunnine formaat</item>
+        <item>24-tunnine formaat</item>
+    </string-array>
+</resources>

app/src/main/res/values-et/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Paigalda kõigepealt SIM-kaart</string>
     <string name="restart">Taaskäivita</string>
     <string name="sim_input_error_3">Sisestasite 3 korda vale PIN-koodi \n, \n kasutage SIM-kaardi avamiseks oma telefoni.</string>
+    <string name="timeformat_hint">See on näidisaeg</string>
 </resources>

app/src/main/res/values-fi/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 h kello</item>
+        <item>24 h kello</item>
+    </string-array>
+</resources>

app/src/main/res/values-fi/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Asenna ensin SIM-kortti</string>
     <string name="restart">Uudelleenkäynnistä</string>
     <string name="sim_input_error_3">Olet syöttänyt väärän PIN-koodin \n-koodin 3 kertaa, \n käytä puhelintasi SIM-kortin lukituksen avaamiseen.</string>
+    <string name="timeformat_hint">Tämä on esimerkkiaika</string>
 </resources>

app/src/main/res/values-fr/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>Format 12 heures</item>
+        <item>Format 24 heures</item>
+    </string-array>
+</resources>

app/src/main/res/values-fr/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Veuillez d\'abord installer la carte SIM</string>
     <string name="restart">Redémarrer</string>
     <string name="sim_input_error_3">Vous avez entré un mauvais code PIN 3 fois, \n veuillez utiliser votre téléphone pour déverrouiller la carte SIM.</string>
+    <string name="timeformat_hint">Ceci est un exemple de temps</string>
 </resources>

app/src/main/res/values-hu/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-óra formátum</item>
+        <item>24-óra formátum</item>
+    </string-array>
+</resources>

app/src/main/res/values-hu/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Először helyezzen be egy SIM-kártyát</string>
     <string name="restart">Újrakezd</string>
     <string name="sim_input_error_3">Háromszor rossz PIN kódot\nadtál meg.\nKérjük, használja a telefonját a SIM-kártya feloldásához.</string>
+    <string name="timeformat_hint">Ez egy példa alkalom</string>
 </resources>

app/src/main/res/values-is/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 tíma snið</item>
+        <item>24 tíma snið</item>
+    </string-array>
+</resources>

app/src/main/res/values-is/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Settu SIM-kortið upp fyrst</string>
     <string name="restart">Endurræsa</string>
     <string name="sim_input_error_3">Þú hefur slegið inn rangan PIN-númer \n 3 sinnum, \n vinsamlegast notaðu símann þinn til að opna SIM-kortið.</string>
+    <string name="timeformat_hint">Þetta er dæmi um tíma</string>
 </resources>

app/src/main/res/values-it/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>Formato 12 ore</item>
+        <item>Formato 24 ore</item>
+    </string-array>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Inserire prima la scheda SIM</string>
     <string name="restart">Ricomincia</string>
     <string name="sim_input_error_3">Hai inserito il codice PIN errato per 3 volte, \n utilizza il telefono per sbloccare la scheda SIM.</string>
+    <string name="timeformat_hint">Questo è un tempo di esempio</string>
 </resources>

app/src/main/res/values-land/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>

app/src/main/res/values-nb/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-timersklokke</item>
+        <item>24-timersklokke</item>
+    </string-array>
+</resources>

app/src/main/res/values-nb/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Installer SIM-kort først</string>
     <string name="restart">Omstart</string>
     <string name="sim_input_error_3">Du har skrevet inn feil PIN-kode 3 ganger, \n vennligst bruk telefonen til å låse opp SIM-kortet.</string>
+    <string name="timeformat_hint">Dette er et eksempel på tid</string>
 </resources>

app/src/main/res/values-nl/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-uurs notatie</item>
+        <item>24-uurs notatie</item>
+    </string-array>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Installeer eerst\nSIM-kaart</string>
     <string name="restart">Herstarten</string>
     <string name="sim_input_error_3">Je hebt 3 keer een verkeerde pincode ingevoerd. \n Gebruik je telefoon om de SIM-kaart te ontgrendelen.</string>
+    <string name="timeformat_hint">Dit is een voorbeeldtijd</string>
 </resources>

app/src/main/res/values-pt/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>Formato de 12 horas</item>
+        <item>Formato de 24 horas</item>
+    </string-array>
+</resources>

app/src/main/res/values-pt/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Instala o cartão SIM primeiro</string>
     <string name="restart">Reiniciar</string>
     <string name="sim_input_error_3">Você digitou o código PIN errado 3 vezes, \n use seu telefone para desbloquear o cartão SIM.</string>
+    <string name="timeformat_hint">Este é um exemplo de tempo</string>
 </resources>

app/src/main/res/values-sl/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12-urni format</item>
+        <item>24-urni format</item>
+    </string-array>
+</resources>

app/src/main/res/values-sl/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Najprej namestite kartico SIM</string>
     <string name="restart">Ponovni zagon</string>
     <string name="sim_input_error_3">3-krat ste vnesli napačno kodo \n PIN, \n uporabite telefon za odklepanje kartice SIM.</string>
+    <string name="timeformat_hint">To je primer časa</string>
 </resources>

app/src/main/res/values-sv/arrays.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 - timmars format</item>
+        <item>24- timmars format</item>
+    </string-array>
+</resources>

app/src/main/res/values-sv/strings.xml

@@ -25,4 +25,5 @@
     <string name="qrcode_install_sim">Installera \nSIM-kortet först</string>
     <string name="restart">Omstart</string>
     <string name="sim_input_error_3">Du har angett fel pinkod \n 3 gånger, \n använd din telefon för att låsa upp SIM-kortet.</string>
+    <string name="timeformat_hint">Detta är en exempeltid</string>
 </resources>

app/src/main/res/values-w1240dp/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">200dp</dimen>
-</resources>

app/src/main/res/values-w600dp/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>

app/src/main/res/values/arrays.xml

@@ -1,41 +1,6 @@
-<resources>
-
-    <string-array name="language_title_array">
-        <item>English</item>
-        <item>Danish</item>
-        <item>Dutch</item>
-        <item>Estonian</item>
-        <item>Finnish</item>
-        <item>French</item>
-        <item>German</item>
-        <item>Hungarian</item>
-        <item>Icelandic</item>
-        <item>Italian</item>
-        <item>Norwegian</item>
-        <item>Portuguese</item>
-        <item>Serbian</item>
-        <item>Slovenian</item>
-        <item>Spanish</item>
-        <item>Swedish</item>
-    </string-array>
-
-    <string-array name="language_Local_array">
-        <item>en</item>
-        <item>da</item>
-        <item>nl</item>
-        <item>et</item>
-        <item>fi</item>
-        <item>fr</item>
-        <item>de</item>
-        <item>hu</item>
-        <item>is</item>
-        <item>it</item>
-        <item>nb</item>
-        <item>pt</item>
-        <item>sr</item>
-        <item>sl</item>
-        <item>es</item>
-        <item>sv</item>
-    </string-array>
-
+<resources>
+    <string-array name="timeformat_titls_array">
+        <item>12 Hour</item>
+        <item>24 Hour</item>
+    </string-array>
 </resources>

app/src/main/res/values/colors.xml

@@ -9,4 +9,5 @@
     <color name="white">#FFFFFFFF</color>
 
     <color name="transparent">#00FFFFFF</color>
+    <color name="xp_yellow">#FFFFC34B</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -32,4 +32,5 @@
 
     <string name="restart">Restart</string>
     <string name="sim_input_error_3">You\'ve input wrong PIN \n 3 times \n Please use your phone to unlock the SIM card</string>
+    <string name="timeformat_hint">This is an example time</string>
 </resources>