Compare commits

..

5 Commits

4 changed files with 22 additions and 7 deletions

View File

@ -9,7 +9,11 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.MyWeather"> android:theme="@style/Theme.MyWeather">
<activity android:name=".AddCity"></activity> <!-- Adding an attribute to remove the app bar only in the activity that allows the user to add a city-->
<activity android:name=".AddCity"
android:parentActivityName=".MainActivity"
android:theme="@style/Theme.MyWeather.NoActionBar">
</activity>
<activity android:name=".MainActivity"> <activity android:name=".MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@ -1,14 +1,20 @@
package fr.romanet.vj.apps.myweather; package fr.romanet.vj.apps.myweather;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.os.Bundle; import android.os.Bundle;
public class AddCity extends AppCompatActivity { public class AddCity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.add_city_page); setContentView(R.layout.add_city_page);
Toolbar toolbarAddCity = (Toolbar) findViewById(R.id.toolbarAddCity);
setSupportActionBar(toolbarAddCity);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
} }
} }

View File

@ -13,18 +13,20 @@
android:theme="@style/Theme.MyWeather.AppBarOverlay"> android:theme="@style/Theme.MyWeather.AppBarOverlay">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbarAddCity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="60dp"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
app:title="Add a city" app:title="Add a city"
android:minHeight="60dp"
app:popupTheme="@style/Theme.MyWeather.PopupOverlay" /> app:popupTheme="@style/Theme.MyWeather.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="130dp" /> android:layout_height="120dp" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
@ -40,7 +42,7 @@
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" /> android:layout_height="100dp" />
<EditText <EditText
android:id="@+id/editText" android:id="@+id/editText"
@ -53,7 +55,7 @@
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" /> android:layout_height="90dp" />
<Button <Button
android:id="@+id/btnSave" android:id="@+id/btnSave"

View File

@ -1,14 +1,17 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Theme.MyWeather" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <style name="Theme.MyWeather" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. --> <!-- Primary brand color. -->
<item name="colorPrimary">@color/red</item> <item name="colorPrimary">@color/red</item>
<item name="colorPrimaryVariant">@color/red</item> <item name="colorPrimaryVariant">@color/red</item>
<item name="colorOnPrimary">@color/white</item> <item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. --> <!-- Secondary brand color. -->
<item name="colorSecondary">@color/red</item> <item name="colorSecondary">@color/red</item>
<item name="colorSecondaryVariant">@color/red</item> <item name="colorSecondaryVariant">@color/red</item>
<item name="colorOnSecondary">@color/white</item> <item name="colorOnSecondary">@color/white</item>
<!-- Status bar color. --> <!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item> <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->