Side Menu Revamp

whyfoo · Dec 17, 2021 · 9d9eada · 9d9eada
1 parent 34f7d37
commit 9d9eada
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 50 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.trolle.trolleapp">
 
+    <uses-feature android:name="android.hardware.camera"
+        android:required="true" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -11,13 +14,13 @@
         android:theme="@style/Theme.Trolleapp">
         <activity
             android:name=".ui.pay.ShoppingListActivity"
-            android:exported="true" />
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
         <activity
             android:name=".ui.side_menu.HelpActivity"
-            android:exported="true" />
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
         <activity
             android:name=".ui.pay.CheckoutActivity"
-            android:exported="true" />
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
         <activity
             android:name=".ui.side_menu.AboutActivity"
             android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -182,14 +182,4 @@
 
     </LinearLayout>
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/rounded_bottom_bar"
-        app:menu="@menu/bottom_bar"
-        />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
@@ -175,14 +175,4 @@
 
     </LinearLayout>
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/rounded_bottom_bar"
-        app:menu="@menu/bottom_bar"
-        />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
@@ -48,14 +48,4 @@
 
     </LinearLayout>
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/rounded_bottom_bar"
-        app:menu="@menu/bottom_bar"
-        />
-
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -40,8 +40,8 @@
     <string name="save">Save</string>
     <string name="profile_picture">Profile Picture</string>
     <string name="about_text">
-        \t\t\t\t\tThis application aims to connect buyers with trolley that are already equipped with the Troll-E system. Later, the buyers will be connected to their digital wallet account and can pay for their purchases through this application. In addition, the history of previous purchases can also be accessed in the profile section.<br />
-        \t\t\t\t\tTroll-E itself is a system that aims to create an easy and automated shopping system. Thus, the convenience of shoppers in shopping can be increased, because they do not have to queue anymore when they want to complete the development process.<br />
+        \t\t\t\t\tThis application aims to connect buyers with trolley that are already equipped with the Troll-E system. Later, the buyers will be connected to their digital wallet account and can pay for their purchases through this application. In addition, the history of previous purchases can also be accessed in the profile section.\n
+        \t\t\t\t\tTroll-E itself is a system that aims to create an easy and automated shopping system. Thus, the convenience of shoppers in shopping can be increased, because they do not have to queue anymore when they want to complete the development process.\n
         \t\t\t\t\tThis system and application was created by a team that consist of 5 members as follow.
     </string>
     <string name="website">Website</string>
@@ -81,19 +81,16 @@
     <string name="member_4">Member 4 : M. As\'ad Muyassir</string>
     <string name="member_5">Member 5 : Jonathan Elloy S.</string>
     <string name="help_text">
-        <ul>
-            <li>First, the buyer must connect the application with the cart used through the Home page of the application. This can be done in 2 ways as follows.</li>
-            \t\t\t\t\t\u25BA By scanning the barcode on the cart.<br />
-            \t\t\t\t\t\u25BA By entering the trolley ID manually.<br /><br />
-            <li>Then, buyers will be directed to the Pay page which will later contain a Shopping List.</li><br />
-            <li>Next, the buyer must point the barcode at the product he wants to buy on the camera provided on the cart, so the system can scan it.</li><br />
-            <li>The scanned product will appear on the Shopping List. Repeat step 4 until the buyer has finished shopping.</li><br />
-            <li>After that, press the Check Out button at the bottom of the Shopping List to see the total price to be paid.</li><br />
-            <li>Buyers will be directed to the Checkout page. Determine the payment method you want to use and make sure that the total price paid is appropriate and the balance in the digital wallet is sufficient.</li><br />
-            <li>Press the Pay button to pay for all purchased products. Wait until there is a notification stating that the payment has been successfully made.</li><br />
-            <li>The shopping process has been completed and the cart connected to the app will be offline after a certain amount of time.</li>
-        </ul>
-
+        <li>First, the buyer must connect the application with the cart used through the Home page of the application. This can be done in 2 ways as follows.</li>\n
+        \t\t\t\t\t\u25BA By scanning the barcode on the cart.\n
+        \t\t\t\t\t\u25BA By entering the trolley ID manually.\n\n
+        <li>Then, buyers will be directed to the Pay page which will later contain a Shopping List.</li>\n\n
+        <li>Next, the buyer must point the barcode at the product he wants to buy on the camera provided on the cart, so the system can scan it.</li>\n\n
+        <li>The scanned product will appear on the Shopping List. Repeat step 4 until the buyer has finished shopping.</li>\n\n
+        <li>After that, press the Check Out button at the bottom of the Shopping List to see the total price to be paid.</li>\n\n
+        <li>Buyers will be directed to the Checkout page. Determine the payment method you want to use and make sure that the total price paid is appropriate and the balance in the digital wallet is sufficient.</li>\n\n
+        <li>Press the Pay button to pay for all purchased products. Wait until there is a notification stating that the payment has been successfully made.</li>\n\n
+        <li>The shopping process has been completed and the cart connected to the app will be offline after a certain amount of time.</li>
     </string>
     <string name="shopping_list">Shopping List</string>
     <string name="pay">Pay</string>