Skip to content
This repository was archived by the owner on Dec 16, 2023. It is now read-only.

Commit 61e6a0e

Browse files
MarkNjungeMarkNjunge
committed
Remove custom app bar
1 parent e1d0d71 commit 61e6a0e

19 files changed

Lines changed: 387 additions & 455 deletions

‎app/src/main/AndroidManifest.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.marknkamau.justjava">
45

56
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -11,7 +12,8 @@
1112
android:icon="@mipmap/ic_launcher"
1213
android:label="@string/app_name"
1314
android:supportsRtl="false"
14-
android:theme="@style/AppTheme">
15+
android:theme="@style/AppTheme"
16+
tools:ignore="GoogleAppIndexingWarning">
1517
<activity
1618
android:name=".ui.SplashActivity"
1719
android:theme="@style/SplashTheme">
@@ -43,16 +45,20 @@
4345
android:name=".ui.login.LogInActivity"
4446
android:configChanges="orientation|keyboardHidden"
4547
android:screenOrientation="portrait"
48+
android:theme="@style/AppThemeNoBar"
4649
android:windowSoftInputMode="adjustPan" />
4750
<activity
4851
android:name=".ui.signup.SignUpActivity"
4952
android:configChanges="orientation|keyboardHidden"
50-
android:screenOrientation="portrait" />
53+
android:screenOrientation="portrait"
54+
android:theme="@style/AppThemeNoBar" />
5155
<activity
5256
android:name=".ui.profile.ProfileActivity"
5357
android:configChanges="orientation|keyboardHidden"
5458
android:screenOrientation="portrait" />
55-
<activity android:name=".ui.about.AboutActivity" />
59+
<activity
60+
android:name=".ui.about.AboutActivity"
61+
android:theme="@style/AppThemeNoBar" />
5662
<activity android:name=".ui.previousOrder.PreviousOrderActivity" />
5763

5864
<service android:name=".data.network.MyFirebaseMessagingService">

‎app/src/main/java/com/marknkamau/justjava/ui/cart/CartActivity.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.marknkamau.justjava.data.models.OrderItem
1313
import com.marknkamau.justjava.ui.BaseActivity
1414
import com.marknkamau.justjava.ui.checkout.CheckoutActivity
1515
import kotlinx.android.synthetic.main.activity_cart.*
16-
import kotlinx.android.synthetic.main.content_appbar.*
1716

1817
class CartActivity : BaseActivity(), CartView {
1918
private lateinit var presenter: CartPresenter
@@ -23,9 +22,6 @@ class CartActivity : BaseActivity(), CartView {
2322
super.onCreate(savedInstanceState)
2423
setContentView(R.layout.activity_cart)
2524

26-
setSupportActionBar(toolbar)
27-
supportActionBar?.setDisplayShowTitleEnabled(false)
28-
2925
val cartDao = (application as JustJavaApp).cartDatabase.cartDao()
3026

3127
presenter = CartPresenter(this, cartDao)

‎app/src/main/java/com/marknkamau/justjava/ui/checkout/CheckoutActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.marknkamau.justjava.ui.main.MainActivity
1919
import com.marknkamau.justjava.ui.previousOrder.PreviousOrderActivity
2020
import com.marknkamau.justjava.utils.trimmedText
2121
import kotlinx.android.synthetic.main.activity_checkout.*
22-
import kotlinx.android.synthetic.main.content_appbar.*
2322
import java.util.*
2423

2524
class CheckoutActivity : BaseActivity(), CheckoutView {
@@ -36,10 +35,6 @@ class CheckoutActivity : BaseActivity(), CheckoutView {
3635
super.onCreate(savedInstanceState)
3736
setContentView(R.layout.activity_checkout)
3837

39-
setSupportActionBar(toolbar)
40-
supportActionBar?.setDisplayShowTitleEnabled(false)
41-
supportActionBar?.setDisplayHomeAsUpEnabled(true)
42-
4338
val authService = (application as JustJavaApp).authService
4439
val preferencesRepo = (application as JustJavaApp).preferencesRepo
4540
val database = (application as JustJavaApp).databaseService

‎app/src/main/java/com/marknkamau/justjava/ui/drinkdetails/DrinkDetailsActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.marknkamau.justjava.ui.BaseActivity
1212
import com.squareup.picasso.Picasso
1313

1414
import kotlinx.android.synthetic.main.activity_drink_details.*
15-
import kotlinx.android.synthetic.main.content_appbar.*
1615
import kotlinx.android.synthetic.main.content_drink_details.*
1716

1817
class DrinkDetailsActivity : BaseActivity(), DrinkDetailsView, View.OnClickListener {
@@ -29,10 +28,6 @@ class DrinkDetailsActivity : BaseActivity(), DrinkDetailsView, View.OnClickListe
2928
super.onCreate(savedInstanceState)
3029
setContentView(R.layout.activity_drink_details)
3130

32-
setSupportActionBar(toolbar)
33-
supportActionBar?.setDisplayShowTitleEnabled(false)
34-
supportActionBar?.setDisplayHomeAsUpEnabled(true)
35-
3631
val cartDao = (application as JustJavaApp).cartDatabase.cartDao()
3732

3833
presenter = DrinkDetailsPresenter(this, cartDao)

‎app/src/main/java/com/marknkamau/justjava/ui/main/MainActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.marknkamau.justjava.ui.BaseActivity
99
import com.marknkamau.justjava.ui.drinkdetails.DrinkDetailsActivity
1010

1111
import kotlinx.android.synthetic.main.activity_main.*
12-
import kotlinx.android.synthetic.main.content_appbar.*
1312

1413
class MainActivity : BaseActivity(), MainView {
1514
private lateinit var presenter: MainPresenter
@@ -19,10 +18,6 @@ class MainActivity : BaseActivity(), MainView {
1918
super.onCreate(savedInstanceState)
2019
setContentView(R.layout.activity_main)
2120

22-
setSupportActionBar(toolbar)
23-
24-
supportActionBar?.setDisplayShowTitleEnabled(false)
25-
2621
catalogAdapter = CatalogAdapter(this) { coffeeDrink ->
2722
val i = Intent(this, DrinkDetailsActivity::class.java)
2823
i.putExtra(DrinkDetailsActivity.DRINK_KEY, coffeeDrink)

‎app/src/main/java/com/marknkamau/justjava/ui/profile/ProfileActivity.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.marknkamau.justjava.ui.previousOrder.PreviousOrderActivity
1717

1818
import com.marknkamau.justjava.utils.trimmedText
1919
import kotlinx.android.synthetic.main.activity_profile.*
20-
import kotlinx.android.synthetic.main.content_appbar.*
2120

2221
class ProfileActivity : BaseActivity(), ProfileView {
2322
private var name: String? = null
@@ -30,9 +29,6 @@ class ProfileActivity : BaseActivity(), ProfileView {
3029
super.onCreate(savedInstanceState)
3130
setContentView(R.layout.activity_profile)
3231

33-
setSupportActionBar(toolbar)
34-
supportActionBar?.setDisplayShowTitleEnabled(false)
35-
3632
adapter = PreviousOrderAdapter(this) { order ->
3733
PreviousOrderActivity.start(this, order)
3834
}

‎app/src/main/res/layout/activity_cart.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
android:orientation="vertical"
88
tools:context="com.marknkamau.justjava.ui.cart.CartActivity">
99

10-
<include layout="@layout/content_appbar" />
11-
1210
<android.support.v7.widget.RecyclerView
1311
android:id="@+id/rvCart"
1412
android:layout_width="0dp"
@@ -41,14 +39,14 @@
4139
android:id="@+id/btnClearCart"
4240
android:layout_width="wrap_content"
4341
android:layout_height="wrap_content"
44-
android:layout_marginEnd="8dp"
4542
android:layout_marginStart="8dp"
43+
android:layout_marginEnd="8dp"
4644
android:background="@android:color/transparent"
4745
android:focusableInTouchMode="true"
4846
android:text="@string/clear_cart"
4947
app:layout_constraintEnd_toEndOf="parent"
5048
app:layout_constraintStart_toStartOf="parent"
51-
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
49+
app:layout_constraintTop_toTopOf="parent" />
5250

5351
<TextView
5452
android:id="@+id/tvCartTotal"

‎app/src/main/res/layout/activity_checkout.xml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,29 @@
88

99
<android.support.constraint.ConstraintLayout
1010
android:layout_width="match_parent"
11-
android:layout_height="match_parent"
11+
android:layout_height="wrap_content"
1212
android:focusable="true"
1313
android:focusableInTouchMode="true"
1414
android:orientation="vertical"
1515
tools:context="com.marknkamau.justjava.ui.checkout.CheckoutActivity">
1616

17-
<include layout="@layout/content_appbar" />
18-
1917
<TextView
2018
android:id="@+id/textView2"
2119
android:layout_width="wrap_content"
2220
android:layout_height="wrap_content"
2321
android:layout_marginStart="8dp"
2422
android:layout_marginTop="8dp"
2523
android:alpha=".87"
26-
android:text="Customer details"
24+
android:text="@string/customer_details"
2725
android:textColor="@android:color/black"
2826
app:layout_constraintStart_toStartOf="parent"
29-
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
27+
app:layout_constraintTop_toTopOf="parent" />
3028

3129
<android.support.design.widget.TextInputLayout
3230
android:id="@+id/tilName"
3331
android:layout_width="0dp"
3432
android:layout_height="wrap_content"
35-
android:layout_marginLeft="8dp"
33+
android:layout_marginStart="8dp"
3634
android:layout_marginTop="8dp"
3735
app:layout_constraintHorizontal_bias="0.0"
3836
app:layout_constraintLeft_toLeftOf="parent"
@@ -46,14 +44,14 @@
4644
android:ems="10"
4745
android:hint="@string/name"
4846
android:inputType="textPersonName"
49-
android:textSize="14sp" />
47+
android:textSize="14sp"
48+
tools:ignore="Autofill" />
5049
</android.support.design.widget.TextInputLayout>
5150

5251
<android.support.design.widget.TextInputLayout
5352
android:id="@+id/tilPhone"
5453
android:layout_width="0dp"
5554
android:layout_height="wrap_content"
56-
android:layout_marginLeft="8dp"
5755
android:layout_marginStart="8dp"
5856
android:layout_marginTop="8dp"
5957
app:layout_constraintLeft_toLeftOf="parent"
@@ -69,14 +67,14 @@
6967
android:ems="10"
7068
android:hint="@string/phone_number"
7169
android:inputType="none|phone"
72-
android:textSize="14sp" />
70+
android:textSize="14sp"
71+
tools:ignore="Autofill" />
7372
</android.support.design.widget.TextInputLayout>
7473

7574
<android.support.design.widget.TextInputLayout
7675
android:id="@+id/tilAddress"
7776
android:layout_width="0dp"
7877
android:layout_height="wrap_content"
79-
android:layout_marginLeft="8dp"
8078
android:layout_marginStart="8dp"
8179
android:layout_marginTop="8dp"
8280
app:layout_constraintLeft_toLeftOf="parent"
@@ -92,16 +90,17 @@
9290
android:ems="10"
9391
android:hint="@string/delivery_address"
9492
android:inputType="textMultiLine"
95-
android:textSize="14sp" />
93+
android:textSize="14sp"
94+
tools:ignore="Autofill" />
9695
</android.support.design.widget.TextInputLayout>
9796

9897
<android.support.design.widget.TextInputLayout
9998
android:id="@+id/tilComments"
10099
android:layout_width="0dp"
101100
android:layout_height="wrap_content"
102101
android:layout_marginLeft="8dp"
103-
android:layout_marginRight="8dp"
104102
android:layout_marginTop="8dp"
103+
android:layout_marginRight="8dp"
105104
app:layout_constraintHorizontal_bias="0.0"
106105
app:layout_constraintLeft_toLeftOf="parent"
107106
app:layout_constraintRight_toRightOf="parent"
@@ -111,7 +110,6 @@
111110
android:id="@+id/etComments"
112111
android:layout_width="match_parent"
113112
android:layout_height="match_parent"
114-
115113
android:hint="@string/additional_comments_optional"
116114
android:textSize="14sp" />
117115
</android.support.design.widget.TextInputLayout>
@@ -134,9 +132,9 @@
134132
android:id="@+id/btnPlaceOrder"
135133
android:layout_width="0dp"
136134
android:layout_height="wrap_content"
137-
android:layout_marginBottom="9dp"
138135
android:layout_marginLeft="8dp"
139136
android:layout_marginRight="8dp"
137+
android:layout_marginBottom="9dp"
140138
android:background="@drawable/large_button"
141139
android:text="@string/place_order"
142140
android:textColor="@android:color/white"

‎app/src/main/res/layout/activity_drink_details.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
android:orientation="vertical"
88
tools:context="com.marknkamau.justjava.ui.drinkdetails.DrinkDetailsActivity">
99

10-
11-
<include layout="@layout/content_appbar" />
12-
1310
<ScrollView
1411
android:layout_width="match_parent"
1512
android:layout_height="match_parent">
@@ -31,6 +28,7 @@
3128
android:layout_width="match_parent"
3229
android:layout_height="match_parent"
3330
android:layout_gravity="center"
31+
android:contentDescription="@string/drink_image_content_desc"
3432
android:scaleType="centerCrop"
3533
app:layout_constraintLeft_toLeftOf="parent"
3634
app:layout_constraintRight_toRightOf="parent"
@@ -42,28 +40,29 @@
4240
android:layout_width="match_parent"
4341
android:layout_height="100dp"
4442
android:layout_gravity="bottom"
45-
app:srcCompat="@drawable/fade" />
43+
app:srcCompat="@drawable/fade"
44+
tools:ignore="ContentDescription" />
4645

4746
</FrameLayout>
4847

4948
<View
5049
android:id="@+id/view2"
5150
android:layout_width="10dp"
5251
android:layout_height="10dp"
53-
android:layout_marginBottom="48dp"
54-
android:layout_marginEnd="8dp"
5552
android:layout_marginStart="8dp"
53+
android:layout_marginEnd="8dp"
54+
android:layout_marginBottom="48dp"
5655
app:layout_constraintBottom_toBottomOf="@+id/frameLayout"
5756
app:layout_constraintEnd_toEndOf="parent"
5857
app:layout_constraintStart_toStartOf="parent" />
5958

6059
<android.support.v7.widget.CardView
6160
android:layout_width="match_parent"
6261
android:layout_height="wrap_content"
63-
android:layout_marginBottom="8dp"
64-
android:layout_marginEnd="8dp"
6562
android:layout_marginStart="8dp"
6663
android:layout_marginTop="8dp"
64+
android:layout_marginEnd="8dp"
65+
android:layout_marginBottom="8dp"
6766
app:layout_constraintBottom_toBottomOf="parent"
6867
app:layout_constraintEnd_toEndOf="parent"
6968
app:layout_constraintStart_toStartOf="parent"

0 commit comments

Comments
 (0)