Skip to content

Commit

Permalink
1. Modified application font.
Browse files Browse the repository at this point in the history
2. Added logo and app icons
3. Fixed some bugs
  • Loading branch information
banditVedant committed Oct 25, 2023
1 parent 4780ccb commit eda6c17
Show file tree
Hide file tree
Showing 56 changed files with 46 additions and 51 deletions.
22 changes: 13 additions & 9 deletions app/src/main/java/com/BugBazaar/ui/NavigationDrawer_Dashboard.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,19 @@ protected void onCreate(Bundle savedInstanceState) {

// product data
productList = new ArrayList<>();
productList.add(new Product("Old Town Camera",getString(R.string.desc_cycle), R.drawable.item_camera,3400));
productList.add(new Product("Dumb Watch", getString(R.string.desc_cycle), R.drawable.item_watch,2700));
productList.add(new Product("Skate-Board", getString(R.string.desc_cycle), R.drawable.item_skateboard,1600));
productList.add(new Product("A Lazy BiCycle", getString(R.string.desc_cycle), R.drawable.item_cycle,7040));
productList.add(new Product("PineApple iPhone", getString(R.string.desc_cycle), R.drawable.item_iphone,6900));
productList.add(new Product("Z Box Gaming Controller", getString(R.string.desc_cycle), R.drawable.item_gc,3400));
productList.add(new Product("A Rat", getString(R.string.desc_cycle), R.drawable.item_mouse,1200));
productList.add(new Product("Spy TWS", getString(R.string.desc_cycle), R.drawable.item_tws,4200));
productList.add(new Product("VR device", getString(R.string.desc_cycle), R.drawable.item_vr,8340));
productList.add(new Product("Old Town Camera",getString(R.string.desc_cycle), R.drawable.item_camera,2499));
productList.add(new Product("Dumb Watch", getString(R.string.desc_cycle), R.drawable.item_watch,2499));
productList.add(new Product("Skate-Board", getString(R.string.desc_cycle), R.drawable.item_skateboard,1659));
productList.add(new Product("A Lazy BiCycle", getString(R.string.desc_cycle), R.drawable.item_cycle,7049));
productList.add(new Product("PineApple iPhone", getString(R.string.desc_cycle), R.drawable.item_iphone,6999));
productList.add(new Product("Z Box Gaming Controller", getString(R.string.desc_cycle), R.drawable.item_gc,3499));
productList.add(new Product("A Rat", getString(R.string.desc_cycle), R.drawable.item_mouse,1199));
productList.add(new Product("Spy TWS", getString(R.string.desc_cycle), R.drawable.item_tws,4199));
productList.add(new Product("Skull phone", getString(R.string.desc_cycle), R.drawable.item_headphones,3599));
productList.add(new Product("Mac'N Cheese book", getString(R.string.desc_cycle), R.drawable.item_mmacbook_air,88389));
productList.add(new Product("Useless Trimmer", getString(R.string.desc_cycle), R.drawable.item_trimmer,799));




//
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/BugBazaar/ui/Signin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@

import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;

import com.BugBazaar.Models.CredentialsLoader;
import com.BugBazaar.R;
import com.BugBazaar.controller.UserAuthSave;
import com.BugBazaar.utils.PermissionManager;
Expand All @@ -29,7 +27,7 @@ public class Signin extends AppCompatActivity implements PermissionCallback {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
setContentView(R.layout.activity_signin);
usernameEditText = findViewById(R.id.editUsername);
passwordEditText = findViewById(R.id.editPassword);
loginButton = findViewById(R.id.btnLogin);
Expand Down
Binary file modified app/src/main/res/drawable-hdpi/sucessful_order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/sucessful_order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/sucessful_order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xxhdpi/bp.jpg
Binary file not shown.
Binary file modified app/src/main/res/drawable-xxhdpi/sucessful_order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/sucessful_order.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/back3.png
Binary file not shown.
Binary file added app/src/main/res/drawable/bb_baklogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_baklogoname.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_baklogoonly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_horizontal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_logoonly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_namelogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_nameonly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_verticle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/bb_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/bp.jpg
Binary file not shown.
Binary file removed app/src/main/res/drawable/ic_backspace.png
Binary file not shown.
Binary file added app/src/main/res/drawable/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/icon_wallet4.png
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/font/font_family.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<font
app:fontStyle="normal"
app:fontWeight="400"
app:font="@font/ptsansregular" />
app:font="@font/ubunturegular" />
</font-family>
7 changes: 0 additions & 7 deletions app/src/main/res/layout/activity_detailed_product.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,5 @@
android:background="@drawable/sharp_button_corners"
android:text="Add to Cart"></Button>

<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/black"
style="?android:attr/buttonBarButtonStyle"
android:text="Save to Wishlist"></Button>
</LinearLayout>
</LinearLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
android:layout_height="match_parent"
android:layout_gravity="start"
app:headerLayout="@layout/nav_header_layout"
app:menu="@menu/navigation_items" />
app:menu="@menu/navigation_items"
/>


</androidx.drawerlayout.widget.DrawerLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
android:layout_gravity="top"
android:background="@drawable/back2">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BugBazaar"
android:textSize="40sp"
android:padding="20dp"
android:layout_gravity="center">

</TextView>
<ImageView
android:layout_width="300dp"
android:layout_height="100dp"
android:layout_marginTop="40dp"
android:layout_gravity="center"
android:src="@drawable/bb_nameonly">
></ImageView>
<ImageView
android:layout_width="220dp"
android:layout_height="220dp"
Expand All @@ -29,24 +27,30 @@
android:layout_height="60dp"
android:ems="10"
android:hint="Username"
android:paddingStart="8dp"
android:inputType="text"
android:layout_gravity="center">
android:layout_gravity="center"
android:textStyle="bold">
</EditText>
<EditText
android:id="@+id/editPassword"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:ems="10"
android:hint="Password"
android:paddingStart="8dp"
android:textStyle="bold"
android:inputType="textPassword"
android:layout_gravity="center">
</EditText>

<Button
android:id="@+id/btnLogin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="100dp"
android:layout_height="60dp"
android:text="Login"
android:layout_gravity="center" />
android:textSize="17dp"
android:layout_gravity="center"
android:textStyle="bold"/>

</LinearLayout>
15 changes: 4 additions & 11 deletions app/src/main/res/layout/nav_header_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,15 @@
android:layout_width="match_parent"
android:layout_height="220dp"
android:padding="14dp"
android:background="#3a5e7d"
android:background="@color/main_theme"
android:orientation="vertical"
android:gravity="bottom">

<ImageView
android:layout_width="266dp"
android:layout_height="155dp"
android:layout_width="240dp"
android:layout_height="150dp"
android:contentDescription="Header Image"
android:src="@drawable/jap"></ImageView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Welcome to BugBazaar!"
android:textSize="23dp"
android:textColor="#fff"
android:textStyle="bold"></TextView>
android:src="@drawable/bb_white"></ImageView>


</LinearLayout>
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
5 changes: 2 additions & 3 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file added app/src/main/res/mipmap-ldpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#eeeedd</color>
</resources>

0 comments on commit eda6c17

Please sign in to comment.