Skip to content

Commit

Permalink
1. Fixed UI glitches.
Browse files Browse the repository at this point in the history 
2. Updated product descriptions
  • Loading branch information
@banditVedant
banditVedant committed Dec 14, 2023
1 parent 2e3684b commit be0b399
Show file tree
Hide file tree
Showing 10 changed files with 70 additions and 35 deletions.
20 changes: 10 additions & 10 deletions app/src/main/java/com/BugBazaar/ui/NavigationDrawer_Dashboard.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@ 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,3199));
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("Old Town Camera",getString(R.string.desc_camera), R.drawable.item_camera,3199));
productList.add(new Product("Dumb Watch", getString(R.string.desc_watch), R.drawable.item_watch,2499));
productList.add(new Product("Skate-Board", getString(R.string.desc_skateboard), 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));
productList.add(new Product("PineApple iPhone", getString(R.string.desc_iphone), R.drawable.item_iphone,6999));
productList.add(new Product("Z Box Gaming Controller", getString(R.string.desc_controller), R.drawable.item_gc,3499));
productList.add(new Product("A Rat", getString(R.string.desc_rat), R.drawable.item_mouse,1199));
productList.add(new Product("Spy TWS", getString(R.string.desc_tws), R.drawable.item_tws,4199));
productList.add(new Product("Skull phone", getString(R.string.desc_skullphone), R.drawable.item_headphones,3599));
productList.add(new Product("Mac'N Cheese book", getString(R.string.desc_macbook), R.drawable.item_mmacbook_air,88389));
productList.add(new Product("Useless Trimmer", getString(R.string.desc_trimmer), R.drawable.item_trimmer,799));


//Handle Deeplink intent
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/BugBazaar/ui/RASPSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_raspsettings);
//Toolbar title set
TextView toolbarTitle = findViewById(R.id.toolbarTitle);
toolbarTitle.setText("RASP Settings");
toolbarTitle.setText("App protection settings");

switch1 = findViewById(R.id.switch1);
switch2 = findViewById(R.id.switch2);
Expand Down
17 changes: 10 additions & 7 deletions app/src/main/res/layout/activity_address.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_weight="10"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
Expand All @@ -64,7 +64,8 @@
android:hint="Enter detailed address.."
></EditText></LinearLayout>
<Button
android:layout_width="90dp"
android:layout_weight="3"
android:layout_width="0dp"
android:layout_height="50dp"
android:text="Save"
android:id="@+id/btnSaveAddress"></Button>
Expand Down Expand Up @@ -92,13 +93,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingEnd="10dp"
android:paddingStart="15dp"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:paddingBottom="5dp">

<EditText
android:layout_weight="10"
android:id="@+id/searchBoxAddress"
android:layout_width="250dp"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginTop="2dp"
Expand All @@ -109,8 +111,9 @@
android:textSize="18sp"
/>
<Button
android:layout_weight="4"
android:id="@+id/btnSearchAddress"
android:layout_width="90dp"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginTop="2dp"
android:text="Search"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_detailed_product.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@
android:id="@+id/detailedDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dp"
android:layout_marginTop="1dp"
android:paddingLeft="10dp"
android:text="Product Description"
android:textSize="20dp" />
android:textSize="18sp" />


</LinearLayout>
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/res/layout/activity_myprofile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/txtViewName3"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.067"></TextView>
Expand All @@ -94,8 +95,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/txtViewEmail"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtViewName"></TextView>
app:layout_constraintTop_toBottomOf="@+id/txtViewName"
app:layout_constraintVertical_bias="0.0"></TextView>

<TextView
android:id="@+id/txtViewName5"
Expand All @@ -109,10 +112,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.033"
app:layout_constraintHorizontal_bias="0.066"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtViewName6"
app:layout_constraintVertical_bias="0.081"></TextView>
app:layout_constraintVertical_bias="0.09"></TextView>

<TextView
android:id="@+id/txtViewName6"
Expand All @@ -127,7 +130,7 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/txtViewMobile"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/txtViewName4"
app:layout_constraintVertical_bias="0.0"></TextView>
Expand Down Expand Up @@ -241,14 +244,14 @@
android:clickable="true"
android:focusable="true"
android:inputType="textMultiLine"
android:paddingTop="10dp"
android:paddingStart="15dp"
android:paddingTop="10dp"
android:paddingEnd="15dp"
android:text="501, Payatu Labs, Camp Road, Pune "
android:textSize="18dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.636"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/txtViewName5"
app:layout_constraintTop_toBottomOf="@+id/txtViewMobile"
app:layout_constraintVertical_bias="0.0"></TextView>
Expand Down
19 changes: 12 additions & 7 deletions app/src/main/res/layout/activity_navigation_drawer_dashboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,32 @@
android:paddingTop="60dp">
<LinearLayout
android:id="@+id/searchLinearLayout"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:layout_gravity="center">
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp">
<EditText
android:layout_weight="12"
android:id="@+id/searchBox"
android:layout_width="270dp"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="10dp"
android:layout_marginLeft="20dp"
android:hint="Search Products"
android:textSize="20sp"
android:layout_gravity="center"/>
<Button
android:id="@+id/btnSearch"
android:layout_width="90dp"
android:layout_weight="4"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginTop="2dp"
android:text="Search"
android:textSize="13dp"></Button>
android:textSize="13dp"
android:textStyle="bold"></Button>

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_raspsettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="RASP Library Settings"
android:text="Protection Level Settings"
android:textSize="28sp"
android:layout_gravity="center"
android:padding="10dp"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_wallet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@
android:layout_weight="1"
android:background="@drawable/sharp_button_corners"
android:text="Proceed to Payment"
android:textSize="17sp"
android:onClick="gotoPayment"/>
</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/menu/navigation_items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<item
android:id="@+id/itemRASP_Settings"
android:title="RASP Settings"
android:title="App Protection Settings"
android:icon="@drawable/baseline_security_24"></item>
</group>

Expand Down
24 changes: 23 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,29 @@
<string name="navigation_drawer_close">Close Drawer</string>
<string name="my_profile">My Profile</string>
<!-- Items Description -->
<string name="desc_cycle">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</string>
<string name="desc_camera">Introducing the "Old Town Camera" – because capturing memories is like fine wine, it gets better with age! This vintage-inspired camera comes with a built-in time machine feature that instantly transports you to the golden days of photography. Say cheese and embark on a nostalgic journey with a touch of retro flair. Warning: May cause sudden urges to dig out old photo albums and reminisce about the good ol days of black and white snapshots. Handle with care, memories included!</string>

<string name="desc_watch">Meet the "Dumb Watch" – because who needs smart when you can have simple sophistication strapped to your wrist? This watch is so dumb, it wont remind you of your unread emails, track your heartbeat, or tell you the weather. Instead, it excels at timeless features like ticking and looking stylish. No apps, no notifications, just good ol hours and minutes doing their thing. Perfect for those who believe in making their own time, without any unnecessary intelligence getting in the way. Dumb never looked so good!</string>

<string name="desc_cycle">Introducing the "Lazy Bicycle," the two-wheeled marvel that understands your need for speed... or lack thereof. Engineered for those who prefer a leisurely cruise over a heart-pounding race, this bike comes with an exclusive Snail Mode for an extra-slow, ultra-relaxed journey. Equipped with a state-of-the-art No Rush Technology, our Lazy Bicycle ensures you arrive exactly when you feel like it, offering a new level of two-wheeled tranquility. So, grab a seat, pedal at your own pace, and let the Lazy Bicycle redefine the art of moving slow and looking cool.</string>

<string name="desc_skateboard">Introducing the "Skate-Board," your ultimate vehicle for pretending youre an effortlessly cool sidewalk surfer without the risk of face-planting. Designed for those who dream of shredding like a pro but reality-check themselves before attempting an ollie. Our board comes with advanced features like wobbly balance and unexpected stops, providing an authentic experience that perfectly mimics your attempts at looking rad. So grab your Skate-Board, hit the pavement, and remember: its not about the tricks you land, but the laughs you share when you cant.</string>

<string name="desc_iphone">Peel away the competition with this tropical tech treat. It’s not just a phone; its a deliciously juicy experience. Loaded with essential vitamins, this Pineapple iPhone is your daily dose of sweetness. Worried about battery life? Dont be! It comes with the unique "Charged by Sunshine" feature. Just leave it in the sun for an hour, and voila – your phone is charged and ready to bring a taste of the tropics to your tech life. Get yours now and join the fruity revolution – because calling should be as refreshing as a sip of piña colada on a beach!</string>

<string name="desc_controller">Meet the Z Box Gaming Computer – where gaming meets intergalactic adventure! This computer is so powerful; its like having a black hole of entertainment right on your desk. Need a break from reality? Dive into a gaming experience so immersive; you might forget where you left your spaceship keys. The Z Box is not just a computer; its a portal to alternate universes where your high scores are celebrated across the cosmos. Worried about lag? Fear not! Our advanced Warp Speed Processing ensures that even in the far reaches of the gaming galaxy, your commands are executed at the speed of light. Upgrade your gaming experience to light speed with the Z Box – because conquering virtual worlds is a universal pastime!</string>

<string name="desc_rat">The computer mouse thats so swift, even cats envy its agility! This mouse is so sleek and fast; it makes ordinary mice look like theyre stuck in slow motion. Equipped with "Stealth Whisker Technology," the HyperClick 3000 lets you navigate through cyberspace with the grace of a ninja cat. Worried about accidental clicks? Fear not! Our "Anti-Pawprint" design ensures that even the most curious feline friends wont leave their mark. The HyperClick 3000: Because your digital adventures deserve a mouse thats purr-fectly fast and fur-iously fun!</string>

<string name="desc_tws">WhisperWear X3: The TWS that even secret agents use when theyre off duty. These earbuds are so discreet; they make ninjas sound like a marching band. With our SilentBeat Technology, you can enjoy your favorite tunes at a volume that wont wake a sleeping cat. Worried about someone overhearing your top-secret playlist? Fear not! The WhisperWear X3 comes with StealthSound mode, ensuring that your music remains classified. Get ready for an eargasm of espionage with WhisperWear X3 – Shhh, its a secret!</string>

<string name="desc_skullphone">Skull Symphony Headphones: When you put these on, its not just music; its a bone-shaking experience. Our headphones are so immersive; youll think youre in a rock concert inside a haunted mansion. With our patented SpookyBass Technology, you can feel the beats in your bones—literally. The Skull Symphony Headphones: because sometimes, you just need a little extra skeleton in your playlist. Warning: May cause involuntary headbanging and a sudden urge to dance like a skeleton.</string>

<string name="desc_macbook">MacN CheeseBook Air: The only laptop that combines the elegance of a MacBook with the comfort of a warm bowl of mac n cheese. Our keyboard is so buttery smooth that typing feels like stirring melted cheese into perfectly cooked pasta. Equipped with the latest Cheesy Chip processor, this laptop is your recipe for success. With a display so crisp, you can practically taste the pixels. The MacN CheeseBook Air: because creativity is best served with a side of cheddar!</string>

<string name="desc_trimmer">Useless Trimmer: For those who want a clean shave from reality but end up with a messy beard of disappointment. Our trimmer comes with a built-in confusion sensor that ensures you will never get the style you intended. With blades as sharp as your last breakup and a battery life shorter than your attention span, the Useless Trimmer is the perfect companion for a grooming routine thats as unpredictable as life itself. Warning: May cause existential beard crises.</string>

<!---->
<string name="hardc0d3d_passw0rd">BugBazaarSeccool</string>

</resources>

0 comments on commit be0b399

Please sign in to comment.