luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-28 16:22:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Dark mode fixes: make Cycling-brown a bit brighter

Browse Source
This commit is contained in:
jannis 2020-03-11 17:00:32 +01:00
parent 6cf233a5ea
commit 32724a58f2
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java
View File

@ -32,7 +32,7 @@ public class LauncherActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setTheme(android.R.style.Theme_Material_Light_NoActionBar);
setTheme(R.style.AppThemeNoActionbar);
setContentView(R.layout.activity_main);
}

15
app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
View File

@ -144,11 +144,20 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
}
private void updateCommentText() {
String commentStr = getString(R.string.comment) + ": " + workout.comment;
String str = "";
if (workout.edited) {
commentStr = getString(R.string.workoutEdited) + "\n" + commentStr;
str += getString(R.string.workoutEdited);
}
commentView.setText(commentStr);
if (workout.comment != null && workout.comment.length() > 0) {
if (str.length() > 0) {
str += "\n";
}
str += getString(R.string.comment) + ": " + workout.comment;
}
if (str.length() == 0) {
str = getString(R.string.noComment);
}
commentView.setText(str);
}
private String getDate() {

2
app/src/main/res/layout/activity_main.xml
View File

@ -21,7 +21,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@android:style/Theme.Material.Light.NoActionBar"
android:theme="@style/AppThemeNoActionbar"
tools:context=".activity.LauncherActivity">
<ImageView

3
app/src/main/res/values/colors.xml
View File

@ -27,6 +27,9 @@
<color name="colorPrimaryBicycling">#523220</color>
<color name="colorPrimaryDarkBicycling">#462A1D</color>
<color name="colorPrimaryBicyclingLighter">#6E422A</color>
<color name="colorPrimaryDarkBicyclingLighter">#5A3625</color>
<color name="colorAccent">#4CAF50</color>
<color name="colorAccentDark">#2E7D32</color>

1
app/src/main/res/values/strings.xml
View File

@ -174,4 +174,5 @@
<string name="OpenStreetMapAttribution">© OpenStreetMap contributors</string>
<string name="theme">Theme</string>
<string name="hintRestart">Please restart the app to apply changes</string>
<string name="noComment">No comment</string>
</resources>

5
app/src/main/res/values/styles.xml
View File

@ -19,6 +19,11 @@
<resources>
<style name="AppThemeNoActionbar" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorPrimary">@color/colorPrimary</item>
<item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:colorAccent">@color/colorAccent</item>
</style>
<style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/colorPrimary</item>