diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcfe68af03c6905a6399a66232307875dc4b0c6d..640c0cf26a5a8f7aa06515f2c445dedcd208b161 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -80,7 +80,7 @@ + android:resource="@drawable/ic_bottom_home" /> - - + + diff --git a/app/src/main/res/drawable-en/appwidget_approveonly_preview.png b/app/src/main/res/drawable-en/appwidget_approveonly_preview.png index 69f8276e515ae0b15838b100d754b0bf7cb9dac0..9c488cd61de4ea902ea4c4a14550fba06bd44a36 100644 Binary files a/app/src/main/res/drawable-en/appwidget_approveonly_preview.png and b/app/src/main/res/drawable-en/appwidget_approveonly_preview.png differ diff --git a/app/src/main/res/drawable-ja/appwidget_approveonly_preview.png b/app/src/main/res/drawable-ja/appwidget_approveonly_preview.png index 69f8276e515ae0b15838b100d754b0bf7cb9dac0..ca4aa77c6a1b5321b25becd4ce1b9695c6589cde 100644 Binary files a/app/src/main/res/drawable-ja/appwidget_approveonly_preview.png and b/app/src/main/res/drawable-ja/appwidget_approveonly_preview.png differ diff --git a/app/src/main/res/drawable-zh-rTW/appwidget_approveonly_preview.png b/app/src/main/res/drawable-zh-rTW/appwidget_approveonly_preview.png index 69f8276e515ae0b15838b100d754b0bf7cb9dac0..ddf76426ef7ade10e540859fc36cd2bfdd4703c6 100644 Binary files a/app/src/main/res/drawable-zh-rTW/appwidget_approveonly_preview.png and b/app/src/main/res/drawable-zh-rTW/appwidget_approveonly_preview.png differ diff --git a/app/src/main/res/drawable-zh/appwidget_approveonly_preview.png b/app/src/main/res/drawable-zh/appwidget_approveonly_preview.png index 69f8276e515ae0b15838b100d754b0bf7cb9dac0..309ed7b7f3e978a96602569c65bb330eb4eb0788 100644 Binary files a/app/src/main/res/drawable-zh/appwidget_approveonly_preview.png and b/app/src/main/res/drawable-zh/appwidget_approveonly_preview.png differ diff --git a/app/src/main/res/drawable/appwidget_approveonly_preview.png b/app/src/main/res/drawable/appwidget_approveonly_preview.png index 69f8276e515ae0b15838b100d754b0bf7cb9dac0..ca4aa77c6a1b5321b25becd4ce1b9695c6589cde 100644 Binary files a/app/src/main/res/drawable/appwidget_approveonly_preview.png and b/app/src/main/res/drawable/appwidget_approveonly_preview.png differ diff --git a/app/src/main/res/drawable/ic_aw_logo_login.png b/app/src/main/res/drawable/ic_aw_logo_login.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1d6f57d527f86d20a03b56cbb92acdac2a69b9 Binary files /dev/null and b/app/src/main/res/drawable/ic_aw_logo_login.png differ diff --git a/app/src/main/res/drawable/ic_aw_logo_login_red.png b/app/src/main/res/drawable/ic_aw_logo_login_red.png deleted file mode 100644 index ceb9c64ef37691e29bacb57ed4df9027e91b3bbc..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/drawable/ic_aw_logo_login_red.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_bottom_external_link_alt.xml b/app/src/main/res/drawable/ic_bottom_external_link_alt.xml new file mode 100644 index 0000000000000000000000000000000000000000..b07cb07396d02b2e2b9f84822cabddc5b9f26262 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_external_link_alt.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_home.xml b/app/src/main/res/drawable/ic_bottom_home.xml new file mode 100644 index 0000000000000000000000000000000000000000..edba4515556f08c1ecae0c7d078cd945f7573640 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_home.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_home_blue.xml b/app/src/main/res/drawable/ic_bottom_home_blue.xml deleted file mode 100644 index 537245294b321a47a727898a65ddd012a3e12b1d..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_bottom_home_blue.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_bottom_search.xml b/app/src/main/res/drawable/ic_bottom_search.xml new file mode 100644 index 0000000000000000000000000000000000000000..a46bf1c5bb4b99a56262819cc4fdf8260a740e9b --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_search.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_search_blue.xml b/app/src/main/res/drawable/ic_bottom_search_blue.xml deleted file mode 100644 index cee583d44d4a0d9f0d0434d9aa30515eaee57847..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_bottom_search_blue.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_bottom_work.xml b/app/src/main/res/drawable/ic_bottom_work.xml new file mode 100644 index 0000000000000000000000000000000000000000..0c7fae93aae86142c3a4833ec28b1e0bada2a59d --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_work.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_work_blue.xml b/app/src/main/res/drawable/ic_bottom_work_blue.xml deleted file mode 100644 index 854268b9f1168c81a592a57defd91015b2314a53..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_bottom_work_blue.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 1a6bfb588a1994e38f044cba474a6029ad30fd85..22cc4e677b58af758aea296cd3b8bda9647113e3 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -28,11 +28,12 @@ android:id="@+id/login_image" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:adjustViewBounds="true" android:layout_centerHorizontal="true" android:layout_marginStart="16dp" android:layout_marginTop="100sp" android:layout_marginEnd="16dp" - android:src="@drawable/ic_aw_logo_login_red" /> + android:src="@drawable/ic_aw_logo_login" /> + android:icon="@drawable/ic_bottom_home"/> + android:icon="@drawable/ic_bottom_work"/> + android:icon="@drawable/ic_bottom_external_link_alt"/> + android:icon="@drawable/ic_bottom_search"/> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 9332161ed29af8ef2f9da2c49e46fb731e9ae8ae..dc5ef1baa4411f3c4328ec08e572868527eb01bd 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 6e9c99187c2284d9a0feb1e22ec70a012be9f07b..9aa4911225173db56431122819829dc2a233f509 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1ed7ef752d13eaf057a5eb249766c2302a7946d8..4dfd11ba346f4e8c77a123189f271b4b452dccf6 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 13026ecdb80c5b3cef51d121427cb1c1ec253b9d..11d142cd45e82f16c151730444241891633dc0e6 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index bacd513dfe07b97a9654c4e5e3fd7d733f36d293..82053ccb91a00d29d49f3a132ecd4356d1845ed1 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 093dc6e04b2cb66d2f587b89c9b29091b7317dd0..d04d623e1f5b1acc943c2528dbbb5944ca2f914b 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 37768f8723d917f59224431d139a7674c4528f77..5d067cd04e80de81fc8d46514fa632db9f49ac0c 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 79e2f37e5cea45a7059c8144455270e35eed5077..afc8a03b3b0cf72506145cedfd9ee270b2dc98f2 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 9b487ecbede81ededd74161f513313d8d69e85e0..b620937df85c535c6bd4a61c3023ca80a9c07bbb 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 4f4a979d8ecfe57493b18432896325fca636dd01..33d7d6e0c37745d65272674642a20195f7c339a2 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index d285095c9e453595aaed8d44a8c1f55df3fe765f..e085be6742ded513d3b7dfa9e91ec7ac6937932d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 65e6a192326bed4cfd5eb8e34a226edd9f722124..4c7d5e8168ec50d1e4a3c764080acf84ec887e1c 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 1cdf5c9c82dc71d5fa634a5086c344ab064e113c..d883147265131cc1ca7718ceffe4b5dee15caa24 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index ac75d7d80a68bab0ba6121e29c33e4ade721f908..394f3fea713f4a1a54190bef68c32940dbf1540b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index b4349730b165eb4398c07db0b3cc1aa483a188e2..3c92093217df441997648624067bc5f52b4dbf7f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ