Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dark-mode-fixes' into 'master'

Browse Source 
More dark more fixes

See merge request !487
This commit is contained in:
Peter Serwylo 2017-04-20 22:44:31 +00:00
commit c4fd369feb
6 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
View File

@ -18,6 +18,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.TextView;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.R;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.Schema;
@ -35,6 +36,7 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
((FDroidApp) getApplication()).applyTheme(this);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_app_list);

2
app/src/main/res/drawable/details_panel_light_background.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="3dp" />
<solid android:color="@color/details_panel_light" />
<solid android:color="?attr/detailPanel" />
</shape>

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

@ -173,7 +173,7 @@
android:paddingBottom="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@color/details_panel_light"
android:background="?attr/detailPanel"
tools:text="NEW IN VERSION 1.0.2233\n\nA lot has happened since the last build:\n\n\t• Improved UI\n\t• Bug fixes"
/>

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

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
tools:text="F-Droid Application manager with a long name that will wrap and then ellipsize"
android:textSize="18sp"
android:textColor="#424242"
android:textColor="?attr/appListItem"
android:lines="2"
android:ellipsize="end"
app:layout_constraintStart_toEndOf="@+id/icon"

2
app/src/main/res/values/attrs.xml
View File

@ -8,5 +8,7 @@
<attr name="mainTabSwapSplashTint" format="color" />
<attr name="categoryName" format="color" />
<attr name="installedApps" format="color" />
<attr name="detailPanel" format="color" />
<attr name="appListItem" format="color" />
</declare-styleable>
</resources>

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

@ -14,11 +14,13 @@
<item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
<item name="appDetailsBackground">#0c0c0c</item>
<item name="appDetailsCardBackground">#000000</item>
<item name="categoryPreviewAppCardBackground">#000000</item>
<item name="categoryPreviewAppCardBackground">#212121</item>
<item name="mainTabSwapBackground">#0a0a0a</item>
<item name="mainTabSwapSplashTint">#050505</item>
<item name="categoryName">#ffffff</item>
<item name="installedApps">#ffffff</item>
<item name="detailPanel">#212121</item>
<item name="appListItem">#ffffff</item>
</style>
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@ -39,6 +41,8 @@
<item name="mainTabSwapSplashTint">#f5f5f5</item>
<item name="categoryName">#4a4a4a</item>
<item name="installedApps">#424242</item>
<item name="detailPanel">#eff4f9</item>
<item name="appListItem">#424242</item>
</style>
<style name="AppThemeDark" parent="AppBaseThemeDark">