diff --git a/.idea/modules.xml b/.idea/modules.xml index bf4147c..816a809 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,11 @@ + + + \ No newline at end of file diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index d53c6a0..4b8bd78 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ android:name=".app.App" android:allowBackup="true" android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_round" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java b/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java index 2c83cb2..061af7d 100644 --- a/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java +++ b/mobile/src/main/java/io/github/marktony/espresso/mvp/search/SearchFragment.java @@ -17,6 +17,7 @@ package io.github.marktony.espresso.mvp.search; import android.app.ActivityOptions; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; @@ -30,6 +31,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import java.util.List; @@ -106,6 +108,7 @@ public void onPause() { @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == android.R.id.home) { + hideImm(); getActivity().onBackPressed(); } return true; @@ -159,4 +162,15 @@ public void OnItemClick(View v, int position) { adapter.updateData(packages, companies); } } + + /** + * Hide the input method like soft keyboard, etc... when they are active. + */ + private void hideImm() { + InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); + if (imm.isActive()) { + imm.hideSoftInputFromWindow(searchView.getWindowToken(), 0); + } + } + } diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java b/mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java index df6a61b..42c685a 100644 --- a/mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java +++ b/mobile/src/main/java/io/github/marktony/espresso/ui/AboutFragment.java @@ -85,7 +85,7 @@ public boolean onPreferenceClick(Preference preference) { prefThx1.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - CustomTabsHelper.openUrl(getContext(), getString(R.string.thanks_1_desc)); + CustomTabsHelper.openUrl(getContext(), getString(R.string.thanks_1_url)); return true; } }); diff --git a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java b/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java index f3a09da..cd13200 100644 --- a/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java +++ b/mobile/src/main/java/io/github/marktony/espresso/ui/onboarding/OnboardingActivity.java @@ -155,7 +155,7 @@ private void updateIndicators(int position) { } } - private Handler handler = new Handler() { + private Handler handler = new Handler() { @Override public void handleMessage(Message msg) { switch (msg.what) { diff --git a/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java b/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java index 0cf0af3..3aad2cb 100644 --- a/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java +++ b/mobile/src/main/java/io/github/marktony/espresso/zxing/utils/InactivityTimer.java @@ -53,11 +53,12 @@ public InactivityTimer(Activity activity) { public synchronized void onActivity() { cancel(); inactivityTask = new InactivityAsyncTask(); - if (Build.VERSION.SDK_INT >= 11) { + /*if (Build.VERSION.SDK_INT >= 11) { inactivityTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } else { inactivityTask.execute(); - } + }*/ + inactivityTask.execute(); } public synchronized void onPause() { diff --git a/mobile/src/main/res/drawable/ic_account_circle_black_24dp.xml b/mobile/src/main/res/drawable/ic_account_circle_black_24dp.xml deleted file mode 100644 index e7bee6c..0000000 --- a/mobile/src/main/res/drawable/ic_account_circle_black_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/mobile/src/main/res/drawable/ic_center_focus_strong_white_24dp.xml b/mobile/src/main/res/drawable/ic_center_focus_strong_white_24dp.xml deleted file mode 100644 index 6b54583..0000000 --- a/mobile/src/main/res/drawable/ic_center_focus_strong_white_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/mobile/src/main/res/drawable/ripple_mask.xml b/mobile/src/main/res/drawable/ripple_mask.xml deleted file mode 100644 index 0e0e8dc..0000000 --- a/mobile/src/main/res/drawable/ripple_mask.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - diff --git a/mobile/src/main/res/drawable/selector.xml b/mobile/src/main/res/drawable/selector.xml deleted file mode 100644 index a948de6..0000000 --- a/mobile/src/main/res/drawable/selector.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/mobile/src/main/res/drawable/side_nav_bar.xml b/mobile/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 1e4411c..0000000 --- a/mobile/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - \ No newline at end of file diff --git a/mobile/src/main/res/icon.png b/mobile/src/main/res/icon.png deleted file mode 100755 index e3d71e1..0000000 Binary files a/mobile/src/main/res/icon.png and /dev/null differ diff --git a/mobile/src/main/res/layout/activity_onboarding.xml b/mobile/src/main/res/layout/activity_onboarding.xml index c74c242..1c16a23 100644 --- a/mobile/src/main/res/layout/activity_onboarding.xml +++ b/mobile/src/main/res/layout/activity_onboarding.xml @@ -21,7 +21,6 @@ android:id="@+id/main_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorPrimary" tools:context=".ui.onboarding.OnboardingActivity"> - - - - - - - - - - - - - - - - - - - - diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100755 index 0000000..50c554c Binary files /dev/null and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100755 index 0000000..9cc2201 Binary files /dev/null and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100755 index 0000000..b13c552 Binary files /dev/null and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100755 index 0000000..59d872f Binary files /dev/null and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100755 index 0000000..f222acc Binary files /dev/null and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/mobile/src/main/res/values-night/colors.xml b/mobile/src/main/res/values-night/colors.xml index 596a7b6..911c1fb 100644 --- a/mobile/src/main/res/values-night/colors.xml +++ b/mobile/src/main/res/values-night/colors.xml @@ -19,12 +19,10 @@ #607d8b #485a66 #546dfe - #CFD8DC #e4e4e4 #b5b5b5 #BDBDBD #35464e - #222222 #a5a5a5 #33000000 diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml index 5bc6f05..0c299f8 100644 --- a/mobile/src/main/res/values-zh-rCN/strings.xml +++ b/mobile/src/main/res/values-zh-rCN/strings.xml @@ -77,7 +77,6 @@ 快递员 编辑包裹名称 包裹名称不能为空! - 重试 diff --git a/mobile/src/main/res/values-zh-rHK/strings.xml b/mobile/src/main/res/values-zh-rHK/strings.xml index 269ced7..70a279d 100644 --- a/mobile/src/main/res/values-zh-rHK/strings.xml +++ b/mobile/src/main/res/values-zh-rHK/strings.xml @@ -77,7 +77,6 @@ 快遞員 編輯包裹名稱 包裹名稱不能為空! - 重試 diff --git a/mobile/src/main/res/values-zh-rTW/strings.xml b/mobile/src/main/res/values-zh-rTW/strings.xml index 7b633fa..abaad70 100644 --- a/mobile/src/main/res/values-zh-rTW/strings.xml +++ b/mobile/src/main/res/values-zh-rTW/strings.xml @@ -77,7 +77,6 @@ 快遞員 編輯包裹名稱 包裹名稱不能為空! - 重試 diff --git a/mobile/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml index 0c60c3d..c68c97e 100644 --- a/mobile/src/main/res/values/colors.xml +++ b/mobile/src/main/res/values/colors.xml @@ -19,12 +19,10 @@ #009688 #00796B #448AFF - #B2DFDB #212121 #757575 #BDBDBD #ebebeb - @android:color/white #757575 #33000000 diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml index b59b57a..2e56229 100644 --- a/mobile/src/main/res/values/dimens.xml +++ b/mobile/src/main/res/values/dimens.xml @@ -16,7 +16,6 @@ - 16dp 160dp 16dp @@ -26,6 +25,5 @@ 16dp 2dp 20dp - 8dp 8dp diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index 924cece..a01b221 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -77,7 +77,6 @@ Deliver man Edit Name The package name can not be empty! - RETRY diff --git a/mobile/src/main/res/xml/settings_prefs.xml b/mobile/src/main/res/xml/settings_prefs.xml index 0018d03..24ea063 100644 --- a/mobile/src/main/res/xml/settings_prefs.xml +++ b/mobile/src/main/res/xml/settings_prefs.xml @@ -37,7 +37,7 @@