From 0bb2b20d2689acc7592907656595e3e3325b78dd Mon Sep 17 00:00:00 2001 From: Sagar Date: Sat, 22 Oct 2022 17:20:42 +0530 Subject: [PATCH 1/2] minor changes --- .idea/misc.xml | 2 +- app/src/main/res/layout/activity_main.xml | 9 +++---- app/src/main/res/layout/fragment_about.xml | 27 ++++++++++--------- .../main/res/layout/fragment_dashboard.xml | 3 ++- .../main/res/layout/fragment_generation.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 14 +++++----- .../main/res/layout/fragment_news_detail.xml | 18 ++++++++----- app/src/main/res/layout/fragment_pokedex.xml | 3 ++- app/src/main/res/layout/fragment_search.xml | 9 +++---- app/src/main/res/layout/fragment_stats.xml | 17 ++++++------ app/src/main/res/layout/item_generation.xml | 5 ++-- app/src/main/res/layout/item_menu.xml | 3 ++- app/src/main/res/layout/item_news.xml | 3 ++- app/src/main/res/layout/item_pokemon.xml | 18 ++++++------- app/src/main/res/values/strings.xml | 21 +++++++++++++++ 15 files changed, 92 insertions(+), 62 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index c1c688a..90709f0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,7 +10,7 @@ - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 70b24c2..d4ed722 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,17 @@ - + android:layout_height="match_parent"> - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index a467bc9..701959d 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -34,6 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" + android:baselineAligned="false" android:orientation="horizontal"> @@ -68,7 +69,7 @@ @@ -76,9 +77,9 @@ android:id="@+id/textViewWeight" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="15.2 lbs (6.9kg)" android:textColor="@color/black" - android:textSize="16sp" /> + android:textSize="16sp" + tools:text="15.2 lbs (6.9kg)" /> @@ -89,7 +90,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Breeding" + android:text="@string/breeding" android:textColor="@color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -104,7 +105,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Gender" + android:text="@string/gender" android:textSize="16sp" /> @@ -113,9 +114,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="2" - android:text="\u2641 87.5% \u2640 12.5%" android:textColor="@color/black" - android:textSize="16sp" /> + android:textSize="16sp" + tools:text="\u2641 87.5% \u2640 12.5%" /> @@ -129,7 +130,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Egg Groups" + android:text="@string/egg_groups" android:textSize="16sp" /> @@ -154,7 +155,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Egg Cycle" + android:text="@string/egg_cycle" android:textSize="16sp" /> @@ -173,7 +174,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Location" + android:text="@string/location" android:textColor="@color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -190,7 +191,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Training" + android:text="@string/training" android:textColor="@color/black" android:textSize="18sp" android:textStyle="bold" /> @@ -206,7 +207,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Base EXP" + android:text="@string/base_exp" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index df93a37..d827cbb 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -30,7 +30,8 @@ android:id="@+id/imageView" android:layout_width="160dp" android:layout_height="160dp" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:contentDescription="@string/pokemon_image" /> + android:contentDescription="@string/pokeball_background_image" + app:tint="@color/white" /> + android:text="@string/main_search" + android:textSize="16sp" /> @@ -119,10 +121,10 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior"> + android:orientation="vertical" + android:paddingTop="8dp"> + android:contentDescription="@string/news_image" + app:tint="@color/white" /> + android:textSize="18sp" + android:textStyle="bold" /> + android:textSize="18sp" + android:textStyle="italic" /> @@ -125,6 +126,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:adjustViewBounds="true" + android:contentDescription="@string/news_image" android:src="@drawable/news3" /> @@ -133,6 +135,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:adjustViewBounds="true" + android:contentDescription="@string/news_image" android:src="@drawable/news4" /> @@ -158,6 +161,7 @@ android:layout_marginEnd="8dp" android:layout_weight="1" android:adjustViewBounds="true" + android:contentDescription="@string/news_image" android:scaleType="fitXY" android:src="@drawable/news4" /> @@ -167,6 +171,7 @@ android:layout_marginEnd="8dp" android:layout_weight="1" android:adjustViewBounds="true" + android:contentDescription="@string/news_image" android:scaleType="fitXY" android:src="@drawable/news3" /> @@ -178,7 +183,6 @@ android:text="@string/lorem_large" android:textSize="18sp" /> - diff --git a/app/src/main/res/layout/fragment_pokedex.xml b/app/src/main/res/layout/fragment_pokedex.xml index 76ffc09..eb67354 100644 --- a/app/src/main/res/layout/fragment_pokedex.xml +++ b/app/src/main/res/layout/fragment_pokedex.xml @@ -18,7 +18,8 @@ android:adjustViewBounds="true" android:alpha="0.10" android:background="@drawable/pokeball" - android:tint="@color/white" /> + app:tint="@color/white" + android:contentDescription="@string/pokeball_background_image" /> @@ -25,22 +23,23 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:gravity="center" android:background="@drawable/background_search_bar" + android:gravity="center" android:orientation="horizontal"> + android:text="@string/main_search" + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/fragment_stats.xml b/app/src/main/res/layout/fragment_stats.xml index be45e50..660e715 100644 --- a/app/src/main/res/layout/fragment_stats.xml +++ b/app/src/main/res/layout/fragment_stats.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/layout/item_generation.xml b/app/src/main/res/layout/item_generation.xml index f8929ef..f0ecb99 100644 --- a/app/src/main/res/layout/item_generation.xml +++ b/app/src/main/res/layout/item_generation.xml @@ -36,8 +36,9 @@ android:layout_marginBottom="-24dp" android:adjustViewBounds="true" android:alpha="0.95" + android:contentDescription="@string/pokeball_background_image" android:src="@drawable/pokeball" - android:tint="@color/white" /> + app:tint="@color/white" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/item_menu.xml b/app/src/main/res/layout/item_menu.xml index aceeefa..18a8109 100644 --- a/app/src/main/res/layout/item_menu.xml +++ b/app/src/main/res/layout/item_menu.xml @@ -36,6 +36,7 @@ android:adjustViewBounds="true" android:alpha="0.25" android:src="@drawable/pokeball" - android:tint="@color/white" /> + app:tint="@color/white" + android:contentDescription="@string/pokeball_background_image" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_news.xml b/app/src/main/res/layout/item_news.xml index 0d26e25..464074a 100644 --- a/app/src/main/res/layout/item_news.xml +++ b/app/src/main/res/layout/item_news.xml @@ -46,7 +46,8 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:adjustViewBounds="true" - android:src="@drawable/news1" /> + android:src="@drawable/news1" + android:contentDescription="@string/news_image" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_pokemon.xml b/app/src/main/res/layout/item_pokemon.xml index 20801dc..92bc04f 100644 --- a/app/src/main/res/layout/item_pokemon.xml +++ b/app/src/main/res/layout/item_pokemon.xml @@ -34,7 +34,6 @@ android:layout_alignParentEnd="true" android:alpha="0.25" android:gravity="top" - android:text="#001" android:textSize="18sp" android:textStyle="bold" tools:text="#001" /> @@ -50,9 +49,9 @@ android:background="@drawable/background_item_pokemon_span" android:paddingStart="8dp" android:paddingEnd="8dp" - android:text="Grass" android:textColor="@color/white" - android:textSize="14sp" /> + android:textSize="14sp" + tools:text="Grass" /> + android:textSize="14sp" + tools:text="Grass" /> + android:textSize="14sp" + tools:text="Grass" /> + app:tint="@color/white" /> - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fc4d89..6ee9ddb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,4 +31,25 @@ Base Stats Evolution Moves + Pokeball Background Image + Search Icon + Height + Weight + Breeding + Gender + Egg Groups + Egg Cycle + Location + Training + Base EXP + Pokemon Image + News Image + HP + Sp. Atk + Defense + Attack + Sp. Def + Speed + Total + Type defenses From 4729410a8ae901066effb1039fcc72b9f2c019b9 Mon Sep 17 00:00:00 2001 From: Sagar Date: Sat, 22 Oct 2022 17:22:10 +0530 Subject: [PATCH 2/2] minor changes --- .idea/androidTestResultsUserPreferences.xml | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .idea/androidTestResultsUserPreferences.xml diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..b907b13 --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file