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

fix dark theme

Browse source
This commit is contained in:
Alexey Kuznetsov 2016-12-24 16:53:42 +03:00
commit 654beea53d
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,6 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
public void setAppTheme(int id) {
super.setTheme(id);
themeId = id;
}
@ -471,9 +470,8 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setAppTheme(getAppTheme());
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@ -485,12 +483,10 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
handler = new Handler();
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
if (Build.VERSION.SDK_INT >= 16)
toolbar.setBackground(new ColorDrawable(MainApplication.getActionbarColor(this)));
else
toolbar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
// if (Build.VERSION.SDK_INT >= 16)
// toolbar.setBackground(new ColorDrawable(MainApplication.getActionbarColor(this)));
// else
// toolbar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
setSupportActionBar(toolbar);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);

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

@ -147,9 +147,8 @@ public class RecordingActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTheme(((MainApplication) getApplication()).getUserTheme());
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_recording);
@ -258,7 +257,7 @@ public class RecordingActivity extends AppCompatActivity {
private void setupActionBar() {
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
// actionBar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
}
}

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

@ -153,7 +153,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
if (actionBar != null) {
// Show the Up button in the action bar.
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
// actionBar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this)));
}
}

3
app/src/main/res/layout/activity_main.xml
View file

@ -16,6 +16,9 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/AppThemeLight.AppBarOverlay"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppThemeLight.PopupOverlay" />
</android.support.design.widget.AppBarLayout>

1
app/src/main/res/layout/activity_recording.xml
View file

@ -34,7 +34,6 @@
</LinearLayout>
<com.github.axet.audiorecorder.widgets.PitchView
android:id="@+id/recording_pitch"
android:layout_width="match_parent"

11
app/src/main/res/values/styles.xml
View file

@ -1,10 +1,10 @@
<resources>
<style name="AppThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="titleColor">@color/colorPrimary</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccentLight</item>
<item name="titleColor">@color/colorPrimary</item>
<item name="secondBackground">#c2c2c2</item>
<item name="roundButton">@drawable/round_button_light</item>
<item name="alertDialogTheme">@style/AppThemeDialogLight</item>
@ -19,15 +19,18 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColorPrimary">@android:color/white</item>
</style>
<style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
</style>
<style name="AppThemeDark" parent="Theme.AppCompat">
<item name="titleColor">@android:color/primary_text_dark</item>
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
<item name="colorPrimary">@color/primary_material_dark</item>
<item name="colorAccent">@color/colorAccentDark</item>
<item name="titleColor">@android:color/primary_text_dark</item>
<item name="secondBackground">#151515</item>
<item name="roundButton">@drawable/round_button_dark</item>
<item name="alertDialogTheme">@style/AppThemeDialogDark</item>