Skip to content

Commit

Permalink
Make splash screen dark
Browse files Browse the repository at this point in the history
  • Loading branch information
benoitletondor committed Oct 23, 2019
1 parent 9025533 commit b4e7cd2
Show file tree
Hide file tree
Showing 78 changed files with 58 additions and 3,792 deletions.
2 changes: 1 addition & 1 deletion Android/EasyBudget/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:theme="@style/LoadingTheme"
android:supportsRtl="false"
tools:ignore="UnusedAttribute">

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.benoitletondor.easybudgetapp.helper

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.benoitletondor.easybudgetapp.R

abstract class BaseActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
setTheme(R.style.AppTheme)

super.onCreate(savedInstanceState)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import android.app.Activity
import android.app.DatePickerDialog
import android.os.Bundle
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer
import com.benoitletondor.easybudgetapp.R
Expand All @@ -41,7 +40,7 @@ import kotlin.math.abs
*
* @author Benoit LETONDOR
*/
class ExpenseEditActivity : AppCompatActivity() {
class ExpenseEditActivity : BaseActivity() {
private val parameters: Parameters by inject()
private val viewModel: ExpenseEditViewModel by viewModel()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import android.view.animation.AlphaAnimation
import android.view.animation.Animation
import android.widget.EditText
import android.widget.LinearLayout
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer

import com.benoitletondor.easybudgetapp.R
Expand Down Expand Up @@ -79,7 +78,7 @@ import org.koin.android.ext.android.inject
*
* @author Benoit LETONDOR
*/
class MainActivity : AppCompatActivity() {
class MainActivity : BaseActivity() {

private lateinit var receiver: BroadcastReceiver

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import android.os.Build
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
import androidx.lifecycle.Observer
import com.benoitletondor.easybudgetapp.R
import com.benoitletondor.easybudgetapp.helper.BaseActivity
import com.benoitletondor.easybudgetapp.helper.setStatusBarColor
import com.benoitletondor.easybudgetapp.iab.PremiumPurchaseFlowResult
import kotlinx.android.synthetic.main.activity_premium.*
Expand All @@ -39,7 +39,7 @@ import java.lang.IllegalStateException
*
* @author Benoit LETONDOR
*/
class PremiumActivity : AppCompatActivity() {
class PremiumActivity : BaseActivity() {

private val viewModel: PremiumViewModel by viewModel()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import android.os.Bundle
import android.view.MenuItem
import android.widget.ArrayAdapter
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer
import com.benoitletondor.easybudgetapp.R
Expand All @@ -39,7 +38,7 @@ import org.koin.android.viewmodel.ext.android.viewModel
import java.text.SimpleDateFormat
import java.util.*

class RecurringExpenseAddActivity : AppCompatActivity() {
class RecurringExpenseAddActivity : BaseActivity() {
private val parameters: Parameters by inject()
private val viewModel: RecurringExpenseAddViewModel by viewModel()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ package com.benoitletondor.easybudgetapp.view.report.base
import android.os.Bundle
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
import androidx.lifecycle.Observer
import androidx.viewpager.widget.ViewPager
import com.benoitletondor.easybudgetapp.R
import com.benoitletondor.easybudgetapp.helper.BaseActivity
import com.benoitletondor.easybudgetapp.helper.getMonthTitle
import com.benoitletondor.easybudgetapp.helper.removeButtonBorder
import com.benoitletondor.easybudgetapp.view.report.MonthlyReportFragment
Expand All @@ -37,7 +37,7 @@ import java.util.*
*
* @author Benoit LETONDOR
*/
class MonthlyReportBaseActivity : AppCompatActivity(), ViewPager.OnPageChangeListener {
class MonthlyReportBaseActivity : BaseActivity(), ViewPager.OnPageChangeListener {

private val viewModel: MonthlyReportBaseViewModel by viewModel()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import android.app.Activity
import android.content.Intent
import android.os.Bundle
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.appcompat.app.AppCompatActivity
import android.view.MenuItem

import com.benoitletondor.easybudgetapp.R
import com.benoitletondor.easybudgetapp.helper.BaseActivity
import com.benoitletondor.easybudgetapp.view.premium.PremiumActivity
import kotlinx.android.synthetic.main.activity_settings.*

Expand All @@ -32,7 +32,7 @@ import kotlinx.android.synthetic.main.activity_settings.*
*
* @author Benoit LETONDOR
*/
class SettingsActivity : AppCompatActivity() {
class SettingsActivity : BaseActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import androidx.viewpager.widget.ViewPager
import android.os.Bundle
import android.view.View
import android.view.ViewAnimationUtils
import androidx.appcompat.app.AppCompatActivity

import com.benoitletondor.easybudgetapp.R
import com.benoitletondor.easybudgetapp.helper.BaseActivity
import com.benoitletondor.easybudgetapp.helper.setStatusBarColor
import com.benoitletondor.easybudgetapp.parameters.Parameters

Expand All @@ -46,7 +46,7 @@ import kotlin.math.max
*
* @author Benoit LETONDOR
*/
class WelcomeActivity : AppCompatActivity() {
class WelcomeActivity : BaseActivity() {
/**
* Broadcast receiver for intent sent by fragments
*/
Expand Down
4 changes: 2 additions & 2 deletions Android/EasyBudget/app/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
-->

<resources>
<color name="window_background">#191e1d</color>
<color name="window_background">@color/easy_budget_dark_background</color>

<color name="primary_light">#444</color>
<color name="primary">@color/easy_budget_green_night</color>
<color name="status_bar_color">#222928</color>
<color name="status_bar_color">@color/easy_budget_dark_status_bar</color>
<color name="action_bar_text_color">@color/easy_budget_green_night</color>
<color name="main_fab_action_color">@color/window_background</color>
<color name="home_fab_button_color">@color/easy_budget_green_night</color>
Expand Down
2 changes: 2 additions & 0 deletions Android/EasyBudget/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<color name="easy_budget_green_light">#B2DFDB</color>
<color name="white">#FFF</color>
<color name="transparent">#00FFFFFF</color>
<color name="easy_budget_dark_background">#191e1d</color>
<color name="easy_budget_dark_status_bar">#222928</color>

<color name="window_background">@color/white</color>
<color name="calendar_background">@color/window_background</color>
Expand Down
28 changes: 28 additions & 0 deletions Android/EasyBudget/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,22 @@
<item name="colorBackgroundFloating">@color/window_background</item>
</style>

<style name="Base.LoadingTheme" parent="android:Theme.Material">
<item name="android:windowBackground">@color/easy_budget_dark_background</item>
<item name="android:actionBarStyle">@style/LoadingActionBarTheme</item>
<item name="android:colorAccent">@color/easy_budget_green_night</item>
<item name="android:colorPrimary">@color/easy_budget_dark_status_bar</item>
<item name="android:colorPrimaryDark">@color/easy_budget_dark_status_bar</item>
</style>

<style name="Base.LoadingActionBarTheme" parent="android:Widget.Material.ActionBar.Solid">
<item name="android:titleTextStyle">@style/LoadingActionBarTitleTextStyle</item>
</style>

<style name="Base.LoadingActionBarTitleTextStyle" parent="android:TextAppearance.Material.Widget.ActionBar.Title">
<item name="android:textColor">@color/easy_budget_green_night</item>
</style>

<style name="ToolBarStyle" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/action_bar_background</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
Expand All @@ -49,6 +65,18 @@

</style>

<style name="LoadingTheme" parent="Base.LoadingTheme">

</style>

<style name="LoadingActionBarTheme" parent="Base.LoadingActionBarTheme">

</style>

<style name="LoadingActionBarTitleTextStyle" parent="Base.LoadingActionBarTitleTextStyle">

</style>

<!-- Buttons -->
<style name="BlueButton" parent="Base.Widget.AppCompat.Button.Colored">
<item name="android:textColor">@color/white</item>
Expand Down

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit b4e7cd2

Please sign in to comment.