bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix theme

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-04-07 23:11:20 +03:00
commit 6059dd3647
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -64,13 +64,13 @@ public class MainActivity extends AppCompatActivity {
themeId = id;
}
int getAppTheme() {
return MainApplication.getTheme(this, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
public static int getAppTheme(Context context) {
return MainApplication.getTheme(context, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
setAppTheme(getAppTheme());
setAppTheme(getAppTheme(this));
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@ -158,7 +158,7 @@ public class MainActivity extends AppCompatActivity {
super.onResume();
Log.d(TAG, "onResume");
if (themeId != getAppTheme()) {
if (themeId != getAppTheme(this)) {
finish();
MainActivity.startActivity(this);
return;

5
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -144,8 +144,13 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_CHANNELS));
}
public static int getAppTheme(Context context) {
return MainApplication.getTheme(context, R.style.AppThemeLight, R.style.AppThemeDark);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
setTheme(getAppTheme(this));
super.onCreate(savedInstanceState);
setupActionBar();

8
app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
View file

@ -1,13 +1,7 @@
package com.github.axet.audiorecorder.app;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.media.AudioFormat;
import android.preference.PreferenceManager;
import android.support.v7.preference.PreferenceManager;
import com.github.axet.androidlibrary.app.MainLibrary;
import com.github.axet.androidlibrary.widgets.ThemeUtils;
import com.github.axet.audiorecorder.R;
public class MainApplication extends com.github.axet.audiolibrary.app.MainApplication {