Commit a53e789c authored by Robert Hitt's avatar Robert Hitt

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
...@@ -21,7 +21,7 @@ apply plugin: 'realm-android' ...@@ -21,7 +21,7 @@ apply plugin: 'realm-android'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion '26.0.2' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "srct.whatsopen" applicationId "srct.whatsopen"
minSdkVersion 16 minSdkVersion 16
......
...@@ -29,14 +29,14 @@ public abstract class BaseThemeActivity extends AppCompatActivity { ...@@ -29,14 +29,14 @@ public abstract class BaseThemeActivity extends AppCompatActivity {
boolean dark = prefs.getBoolean("dark_theme", false); boolean dark = prefs.getBoolean("dark_theme", false);
// look at the udacity course. In this section you might want to reload, // 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 // 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){ if(dark){
setTheme(R.style.darkTheme); setTheme(R.style.darkTheme);
Log.d("BaseThemeActivity", ".onCreate() Theme is now dark"); Log.d("BaseThemeActivity", ".onCreate() Theme is now dark");
}else{ }else{
setTheme(R.style.AppTheme); setTheme(R.style.AppTheme);
Log.e("BaseThemeActivity", ".onCreate() Theme is now light"); Log.d("BaseThemeActivity", ".onCreate() Theme is now light");
} }
super.onCreate(bundle); super.onCreate(bundle);
} }
...@@ -58,9 +58,9 @@ public abstract class BaseThemeActivity extends AppCompatActivity { ...@@ -58,9 +58,9 @@ public abstract class BaseThemeActivity extends AppCompatActivity {
}else if (actTheme == R.style.AppTheme && dark){ }else if (actTheme == R.style.AppTheme && dark){
Log.d("BaseThemeActivity", ".onStart calling recreate to set to dark"); Log.d("BaseThemeActivity", ".onStart calling recreate to set to dark");
recreate(); recreate();
}else{
super.onStart();
} }
super.onStart();
} }
......
...@@ -11,6 +11,7 @@ import android.support.v7.widget.Toolbar; ...@@ -11,6 +11,7 @@ import android.support.v7.widget.Toolbar;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.Toast;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import srct.whatsopen.MyApplication; import srct.whatsopen.MyApplication;
......
...@@ -10,7 +10,7 @@ buildscript { ...@@ -10,7 +10,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' 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 'io.realm:realm-gradle-plugin:3.0.0'
classpath 'me.tatarka:gradle-retrolambda:3.3.1' classpath 'me.tatarka:gradle-retrolambda:3.3.1'
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment