Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor changes, more robust application✅ #141

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor changes, more robust application✅ #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb2b20
minor changes
Sagar0-0 Oct 22, 2022
4729410
minor changes
Sagar0-0 Oct 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .idea/androidTestResultsUserPreferences.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">

<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
android:layout_alignParentStart="true"
app:defaultNavHost="true"
app:navGraph="@navigation/mobile_navigation" />

</RelativeLayout>
27 changes: 14 additions & 13 deletions app/src/main/res/layout/fragment_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:baselineAligned="false"
android:orientation="horizontal">

<LinearLayout
Expand All @@ -45,7 +46,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Height"
android:text="@string/height"
android:textSize="16sp" />


Expand All @@ -68,17 +69,17 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Weight"
android:text="@string/weight"
android:textSize="16sp" />


<TextView
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)" />

</LinearLayout>
</LinearLayout>
Expand All @@ -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" />
Expand All @@ -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" />


Expand All @@ -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%" />

</LinearLayout>

Expand All @@ -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" />


Expand All @@ -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" />


Expand All @@ -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" />
Expand All @@ -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" />
Expand All @@ -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" />


Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_generation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundLight"
android:overScrollMode="never"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:background="@color/backgroundLight"
app:layoutManager="GridLayoutManager"
tools:itemCount="8"
tools:listitem="@layout/item_generation"
Expand Down
14 changes: 8 additions & 6 deletions app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
android:adjustViewBounds="true"
android:alpha="0.10"
android:background="@drawable/pokeball"
android:tint="@color/white" />
android:contentDescription="@string/pokeball_background_image"
app:tint="@color/white" />

<View
android:layout_width="match_parent"
Expand Down Expand Up @@ -83,24 +84,25 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:gravity="center"
android:layout_marginBottom="16dp"
android:background="@drawable/background_search_bar"
android:gravity="center"
android:orientation="horizontal">

<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/search_icon"
android:src="@drawable/search" />

<TextView
android:id="@+id/search_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textSize="16sp"
android:text="@string/main_search" />
android:text="@string/main_search"
android:textSize="16sp" />

</LinearLayout>
</androidx.appcompat.widget.Toolbar>
Expand All @@ -119,10 +121,10 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<LinearLayout
android:paddingTop="8dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:paddingTop="8dp">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerViewMenu"
Expand Down
18 changes: 11 additions & 7 deletions app/src/main/res/layout/fragment_news_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundLight"
Expand Down Expand Up @@ -40,7 +39,8 @@
android:layout_marginEnd="16dp"
android:adjustViewBounds="true"
android:background="@drawable/news1"
android:tint="@color/white" />
android:contentDescription="@string/news_image"
app:tint="@color/white" />

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand Down Expand Up @@ -86,17 +86,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textStyle="bold"
android:text="@string/news_date"
android:textSize="18sp" />
android:textSize="18sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/lorem_small"
android:textStyle="italic"
android:textSize="18sp" />
android:textSize="18sp"
android:textStyle="italic" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -110,6 +110,7 @@
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/news_image"
android:scaleType="fitXY"
android:src="@drawable/news2" />

Expand All @@ -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" />


Expand All @@ -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" />

</LinearLayout>
Expand All @@ -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" />

Expand All @@ -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" />
</LinearLayout>
Expand All @@ -178,7 +183,6 @@
android:text="@string/lorem_large"
android:textSize="18sp" />


</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_pokedex.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/fragment_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
Expand All @@ -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">

<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/search_icon"
android:src="@drawable/search" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textSize="16sp"
android:text="@string/main_search" />
android:text="@string/main_search"
android:textSize="16sp" />

</LinearLayout>

Expand Down
Loading