Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-android
Commits
a53e789c
Commit
a53e789c
authored
Oct 04, 2018
by
Robert Hitt
Browse files
Merge branch '22themes/master/lundquism' into 'master'
22themes/master/lundquism See merge request
!13
parents
463057f8
51d84ab9
Pipeline
#3332
passed with stages
in 5 minutes and 29 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
a53e789c
...
...
@@ -21,7 +21,7 @@ apply plugin: 'realm-android'
android
{
compileSdkVersion
26
buildToolsVersion
'2
6
.0.
2
'
buildToolsVersion
'2
7
.0.
3
'
defaultConfig
{
applicationId
"srct.whatsopen"
minSdkVersion
16
...
...
app/src/main/java/srct/whatsopen/views/activities/BaseThemeActivity.java
View file @
a53e789c
...
...
@@ -29,14 +29,14 @@ public abstract class BaseThemeActivity extends AppCompatActivity {
boolean
dark
=
prefs
.
getBoolean
(
"dark_theme"
,
false
);
// look at the udacity course. In this section you might want to reload,
// but this would mean every activity would have to set the right theme
Log
.
e
(
"BaseThemeActivity"
,
".onCreate Recreate called?"
);
Log
.
d
(
"BaseThemeActivity"
,
".onCreate Recreate called?"
);
if
(
dark
){
setTheme
(
R
.
style
.
darkTheme
);
Log
.
d
(
"BaseThemeActivity"
,
".onCreate() Theme is now dark"
);
}
else
{
setTheme
(
R
.
style
.
AppTheme
);
Log
.
e
(
"BaseThemeActivity"
,
".onCreate() Theme is now light"
);
Log
.
d
(
"BaseThemeActivity"
,
".onCreate() Theme is now light"
);
}
super
.
onCreate
(
bundle
);
}
...
...
@@ -58,9 +58,9 @@ public abstract class BaseThemeActivity extends AppCompatActivity {
}
else
if
(
actTheme
==
R
.
style
.
AppTheme
&&
dark
){
Log
.
d
(
"BaseThemeActivity"
,
".onStart calling recreate to set to dark"
);
recreate
();
}
else
{
super
.
onStart
();
}
super
.
onStart
();
}
...
...
app/src/main/java/srct/whatsopen/views/activities/SettingsActivity.java
View file @
a53e789c
...
...
@@ -11,6 +11,7 @@ import android.support.v7.widget.Toolbar;
import
android.util.Log
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.widget.Toast
;
import
butterknife.ButterKnife
;
import
srct.whatsopen.MyApplication
;
...
...
build.gradle
View file @
a53e789c
...
...
@@ -10,7 +10,7 @@ buildscript {
}
dependencies
{
classpath
'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath
'com.android.tools.build:gradle:3.1.
3
'
classpath
'com.android.tools.build:gradle:3.1.
4
'
classpath
'io.realm:realm-gradle-plugin:3.0.0'
classpath
'me.tatarka:gradle-retrolambda:3.3.1'
classpath
'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment