Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renamed AppTheme to AzureTheme #1465

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ You can get the jar file from maven the repo and drop into the *libs* folder in
android:debuggable="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AzureTheme" >

<activity
android:name="com.microsoft.aad.adal.AuthenticationActivity"
Expand Down
4 changes: 2 additions & 2 deletions adal/src/main/res/values-v11/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<!--
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
AzureBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<style name="AzureBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
</style>

Expand Down
4 changes: 2 additions & 2 deletions adal/src/main/res/values-v14/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<!--
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
AzureBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<style name="AzureBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>

Expand Down
6 changes: 3 additions & 3 deletions adal/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<!--
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
by AzureBaseTheme from res/values-vXX/styles.xml on newer devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Light">
<style name="AzureBaseTheme" parent="android:Theme.Light">
<!--
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
Expand All @@ -13,7 +13,7 @@
</style>

<!-- Application theme. -->
<style name="AppTheme" parent="AppBaseTheme">
<style name="AzureTheme" parent="AzureBaseTheme">
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
</style>

Expand Down
2 changes: 1 addition & 1 deletion userappwithbroker/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
android:theme="@style/AzureTheme" >
<activity
android:name=".MainActivity"
android:label="@string/app_name" >
Expand Down
4 changes: 2 additions & 2 deletions userappwithbroker/src/main/res/layout/app_bar_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:theme="@style/AzureTheme.AppBarOverlay">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
app:popupTheme="@style/AzureTheme.PopupOverlay" />

</com.google.android.material.appbar.AppBarLayout>

Expand Down
4 changes: 2 additions & 2 deletions userappwithbroker/src/main/res/values-v11/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<!--
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
AzureBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<style name="AzureBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
</style>

Expand Down
4 changes: 2 additions & 2 deletions userappwithbroker/src/main/res/values-v14/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<!--
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
AzureBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<style name="AzureBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>

Expand Down
8 changes: 4 additions & 4 deletions userappwithbroker/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AzureTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

<style name="AppTheme.NoActionBar">
<style name="AzureTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AzureTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />

<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AzureTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

</resources>