From 755588202f7486da86203f54eee6ec330dd1f921 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Mon, 12 Apr 2021 16:36:17 +0000 Subject: [PATCH] feat: rebase app themes to material themes --- app/build.gradle | 2 +- app/src/basic/res/xml/preferences.xml | 31 +- app/src/full/AndroidManifest.xml | 4 +- .../fdroid/fdroid/nearby/SelectAppsView.java | 20 - .../fdroid/nearby/SwapWorkflowActivity.java | 15 +- .../fdroid/panic/CalculatorActivity.java | 10 +- .../panic/PanicPreferencesActivity.java | 37 +- .../panic/SelectInstalledAppsActivity.java | 9 +- app/src/full/res/drawable/ic_check_circle.xml | 12 - .../select_local_apps_list_item.xml | 79 --- .../select_local_apps_list_item.xml | 71 --- .../full/res/layout/activity_calculator.xml | 505 +++++++++--------- .../res/layout/activity_panic_settings.xml | 43 +- .../full/res/layout/main_tab_categories.xml | 3 +- .../layout/select_local_apps_list_item.xml | 4 - app/src/full/res/layout/swap_activity.xml | 29 +- app/src/full/res/values/styles.xml | 10 +- app/src/main/AndroidManifest.xml | 9 +- .../java/org/fdroid/fdroid/AboutActivity.java | 3 - .../java/org/fdroid/fdroid/FDroidApp.java | 89 ++- .../fdroid/fdroid/NfcNotEnabledActivity.java | 3 +- .../java/org/fdroid/fdroid/Preferences.java | 8 +- .../views/InstallConfirmActivity.java | 5 +- .../fdroid/views/AppDetailsActivity.java | 12 +- .../fdroid/views/InstallHistoryActivity.java | 11 +- .../fdroid/views/ManageReposActivity.java | 105 ++-- .../fdroid/views/PreferencesFragment.java | 64 ++- .../fdroid/views/RepoDetailsActivity.java | 8 +- .../fdroid/views/ScreenShotsActivity.java | 2 +- .../fdroid/views/apps/AppListActivity.java | 4 +- .../installed/InstalledAppsActivity.java | 27 +- .../fdroid/views/main/MainActivity.java | 13 +- .../button_primary_background_selector.xml | 10 - .../button_secondary_background_selector.xml | 11 - .../button_primary_background_selector.xml | 27 - .../button_secondary_background_selector.xml | 28 - .../details_panel_donate_background_night.xml | 5 - app/src/main/res/drawable/ic_close.xml | 10 + app/src/main/res/drawable/ic_more.xml | 10 - app/src/main/res/drawable/ic_search.xml | 6 +- .../res/drawable/ic_warning_black_24dp.xml | 10 - .../res/drawable/ic_warning_white_24dp.xml | 10 - app/src/main/res/layout-v21/app_details2.xml | 62 +++ .../res/layout-v21/app_details2_header.xml | 266 +++++++++ app/src/main/res/layout/about.xml | 22 +- app/src/main/res/layout/activity_app_list.xml | 3 +- .../res/layout/activity_install_history.xml | 21 +- app/src/main/res/layout/activity_main.xml | 3 +- .../main/res/layout/activity_repo_details.xml | 174 +++--- .../main/res/layout/activity_screenshots.xml | 3 +- .../res/layout/activity_screenshots_page.xml | 3 +- app/src/main/res/layout/app_card_normal.xml | 82 +-- app/src/main/res/layout/app_details2.xml | 82 +-- .../main/res/layout/app_details2_header.xml | 8 +- app/src/main/res/layout/category_item.xml | 11 +- .../main/res/layout/installed_apps_layout.xml | 78 +-- app/src/main/res/layout/main_tab_latest.xml | 1 - app/src/main/res/layout/main_tab_updates.xml | 3 +- .../main/res/layout/repo_list_activity.xml | 48 +- .../main/res/menu/repo_details_activity.xml | 3 +- .../main/res/transition/shared_elements.xml | 7 - app/src/main/res/values-af/strings.xml | 1 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ast/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn-rBD/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-bo/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-cy/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rGB/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es-rAR/strings.xml | 1 - app/src/main/res/values-es-rMX/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-hy/strings.xml | 1 - app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-kab/strings.xml | 1 - app/src/main/res/values-kn/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 1 - app/src/main/res/values-ml/strings.xml | 1 - app/src/main/res/values-mn/strings.xml | 1 - app/src/main/res/values-mr/strings.xml | 1 - app/src/main/res/values-my/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-night/themes.xml | 55 ++ app/src/main/res/values-nl-rBE/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-nn/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sc/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sn/strings.xml | 1 - app/src/main/res/values-sq/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-te/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-v21/styles.xml | 29 - app/src/main/res/values-v23/styles.xml | 13 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/array.xml | 2 +- app/src/main/res/values/colors.xml | 9 +- app/src/main/res/values/shape.xml | 51 ++ app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles.xml | 138 ++--- app/src/main/res/values/styles_detail.xml | 33 +- app/src/main/res/values/themes.xml | 72 +++ app/src/main/res/values/type.xml | 27 + app/src/main/res/xml/preferences.xml | 307 +++++------ .../fdroid/views/AppDetailsAdapterTest.java | 5 +- 143 files changed, 1624 insertions(+), 1445 deletions(-) delete mode 100644 app/src/full/res/drawable/ic_check_circle.xml delete mode 100644 app/src/full/res/layout-v11/select_local_apps_list_item.xml delete mode 100644 app/src/full/res/layout-v17/select_local_apps_list_item.xml delete mode 100644 app/src/main/res/drawable-v21/button_primary_background_selector.xml delete mode 100644 app/src/main/res/drawable-v21/button_secondary_background_selector.xml delete mode 100644 app/src/main/res/drawable/button_primary_background_selector.xml delete mode 100644 app/src/main/res/drawable/button_secondary_background_selector.xml delete mode 100644 app/src/main/res/drawable/details_panel_donate_background_night.xml create mode 100644 app/src/main/res/drawable/ic_close.xml delete mode 100644 app/src/main/res/drawable/ic_more.xml delete mode 100644 app/src/main/res/drawable/ic_warning_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_warning_white_24dp.xml create mode 100644 app/src/main/res/layout-v21/app_details2.xml create mode 100644 app/src/main/res/layout-v21/app_details2_header.xml delete mode 100644 app/src/main/res/transition/shared_elements.xml create mode 100644 app/src/main/res/values-night/themes.xml delete mode 100644 app/src/main/res/values-v21/styles.xml delete mode 100644 app/src/main/res/values-v23/styles.xml create mode 100644 app/src/main/res/values/shape.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/values/type.xml diff --git a/app/build.gradle b/app/build.gradle index 9e34ab64d..50d332503 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,7 @@ android { versionName getVersionName() testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - minSdkVersion 14 + minSdkVersion 22 //noinspection ExpiredTargetSdkVersion targetSdkVersion 25 /* diff --git a/app/src/basic/res/xml/preferences.xml b/app/src/basic/res/xml/preferences.xml index f23e81ea3..42a7cc08e 100644 --- a/app/src/basic/res/xml/preferences.xml +++ b/app/src/basic/res/xml/preferences.xml @@ -1,13 +1,8 @@ - + - - - + @@ -47,7 +42,7 @@ android:title="@string/over_data" android:defaultValue="@integer/defaultOverData" android:layout="@layout/preference_seekbar"/> - @@ -56,7 +51,7 @@ android:title="@string/update_interval" android:defaultValue="@integer/defaultUpdateInterval" android:layout="@layout/preference_seekbar"/> - @@ -77,26 +72,26 @@ - - - - - - - - diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml index ffc489a44..6593e0f3b 100644 --- a/app/src/full/AndroidManifest.xml +++ b/app/src/full/AndroidManifest.xml @@ -56,7 +56,6 @@ android:name=".nearby.SwapWorkflowActivity" android:parentActivityName=".views.main.MainActivity" android:launchMode="singleTask" - android:theme="@style/SwapTheme.Wizard" android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"> + android:label="@string/hiding_calculator"> diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java index f0409ec9a..d3fa77052 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java @@ -200,8 +200,6 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall } }); } - - updateCheckedIndicatorView(view, listView.isItemChecked(listPosition)); } public void updateCheckedIndicatorView(int position, boolean checked) { @@ -210,24 +208,6 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall if (position >= firstListItemPosition && position <= lastListItemPosition) { final int childIndex = position - firstListItemPosition; - updateCheckedIndicatorView(listView.getChildAt(childIndex), checked); - } - } - - private void updateCheckedIndicatorView(View view, boolean checked) { - ImageView imageView = (ImageView) view.findViewById(R.id.checked); - if (imageView != null) { - int resource; - int colour; - if (checked) { - resource = R.drawable.ic_check_circle; - colour = ContextCompat.getColor(getContext(), R.color.swap_bright_blue); - } else { - resource = R.drawable.ic_add_circle_outline; - colour = 0xFFD0D0D4; - } - imageView.setImageDrawable(ContextCompat.getDrawable(getContext(), resource)); - imageView.setColorFilter(colour, PorterDuff.Mode.MULTIPLY); } } } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index 64f210bad..9716dbe98 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -42,10 +42,10 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.SwitchCompat; -import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import com.google.android.material.appbar.MaterialToolbar; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; @@ -106,7 +106,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { private static final int REQUEST_WRITE_SETTINGS_PERMISSION = 5; private static final int STEP_INTRO = 1; // TODO remove this special case, only use layoutResIds - private Toolbar toolbar; + private MaterialToolbar toolbar; private SwapView currentView; private boolean hasPreparedLocalRepo; private boolean newIntent; @@ -200,7 +200,11 @@ public class SwapWorkflowActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - ((FDroidApp) getApplication()).setSecureWindow(this); + FDroidApp fdroidApp = (FDroidApp) getApplication(); + fdroidApp.setSecureWindow(this); + + fdroidApp.applyPureBlackBackgroundInDarkTheme(this); + super.onCreate(savedInstanceState); currentView = new SwapView(this); // dummy placeholder to avoid NullPointerExceptions; @@ -213,10 +217,8 @@ public class SwapWorkflowActivity extends AppCompatActivity { setContentView(R.layout.swap_activity); - toolbar = (Toolbar) findViewById(R.id.toolbar); - toolbar.setTitleTextAppearance(getApplicationContext(), R.style.SwapTheme_Wizard_Text_Toolbar); + toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); container = (ViewGroup) findViewById(R.id.container); @@ -494,7 +496,6 @@ public class SwapWorkflowActivity extends AppCompatActivity { currentView.setLayoutResId(viewRes); currentSwapViewLayoutRes = viewRes; - toolbar.setBackgroundColor(currentView.getToolbarColour()); toolbar.setTitle(currentView.getToolbarTitle()); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java index e706093ad..40a557618 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/CalculatorActivity.java @@ -3,11 +3,14 @@ package org.fdroid.fdroid.panic; import android.os.Bundle; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.Button; import android.widget.TextView; import android.widget.Toast; + +import com.google.android.material.appbar.MaterialToolbar; + +import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import java.util.regex.Pattern; @@ -35,10 +38,13 @@ public class CalculatorActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + FDroidApp fdroidApp = (FDroidApp) getApplication(); + fdroidApp.applyPureBlackBackgroundInDarkTheme(this); + super.onCreate(savedInstanceState); setContentView(R.layout.activity_calculator); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + MaterialToolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); textView = (TextView) findViewById(R.id.textView); diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java index 5b6513784..2aa3fa2ea 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesActivity.java @@ -1,10 +1,12 @@ package org.fdroid.fdroid.panic; import android.os.Bundle; -import androidx.appcompat.app.ActionBar; +import android.view.View; + import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; + +import com.google.android.material.appbar.MaterialToolbar; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; @@ -12,26 +14,19 @@ public class PanicPreferencesActivity extends AppCompatActivity { @Override public void onCreate(Bundle bundle) { - ((FDroidApp) getApplication()).applyTheme(this); + FDroidApp fdroidApp = (FDroidApp) getApplication(); + fdroidApp.applyPureBlackBackgroundInDarkTheme(this); + super.onCreate(bundle); setContentView(R.layout.activity_panic_settings); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - ActionBar ab = getSupportActionBar(); - if (ab != null) { - ab.setDisplayShowHomeEnabled(true); - ab.setDisplayHomeAsUpEnabled(true); - } + MaterialToolbar toolbar = findViewById(R.id.toolbar); + toolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + // Handle navigation icon press + onBackPressed(); + } + }); } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - return super.onOptionsItemSelected(item); - } - } diff --git a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java index 46655d9de..08770f15e 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/SelectInstalledAppsActivity.java @@ -29,14 +29,14 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; -import androidx.core.content.ContextCompat; import androidx.loader.app.LoaderManager; import androidx.loader.content.CursorLoader; import androidx.loader.content.Loader; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.appbar.MaterialToolbar; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -54,13 +54,14 @@ public class SelectInstalledAppsActivity extends AppCompatActivity implements Lo @Override protected void onCreate(Bundle savedInstanceState) { + FDroidApp fdroidApp = (FDroidApp) getApplication(); + fdroidApp.applyPureBlackBackgroundInDarkTheme(this); - ((FDroidApp) getApplication()).applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.installed_apps_layout); - Toolbar toolbar = findViewById(R.id.toolbar); + MaterialToolbar toolbar = findViewById(R.id.toolbar); toolbar.setTitle(getString(R.string.panic_add_apps_to_uninstall)); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/full/res/drawable/ic_check_circle.xml b/app/src/full/res/drawable/ic_check_circle.xml deleted file mode 100644 index 6e255457a..000000000 --- a/app/src/full/res/drawable/ic_check_circle.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/full/res/layout-v11/select_local_apps_list_item.xml b/app/src/full/res/layout-v11/select_local_apps_list_item.xml deleted file mode 100644 index d3759fb37..000000000 --- a/app/src/full/res/layout-v11/select_local_apps_list_item.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/full/res/layout-v17/select_local_apps_list_item.xml b/app/src/full/res/layout-v17/select_local_apps_list_item.xml deleted file mode 100644 index 2c41d775e..000000000 --- a/app/src/full/res/layout-v17/select_local_apps_list_item.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/full/res/layout/activity_calculator.xml b/app/src/full/res/layout/activity_calculator.xml index 4527ef735..ec75a1343 100644 --- a/app/src/full/res/layout/activity_calculator.xml +++ b/app/src/full/res/layout/activity_calculator.xml @@ -1,291 +1,302 @@ - - - + android:layout_height="match_parent" + tools:context=".panic.CalculatorActivity" + android:fitsSystemWindows="true"> + + + + + + + android:id="@+id/textView" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginBottom="8dp" + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:gravity="bottom|end" + android:padding="5dp" + android:textAlignment="textEnd" + android:textSize="22sp" + android:typeface="monospace" + app:layout_constraintBottom_toTopOf="@+id/ce" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/topAppBarLayout" + tools:text="1337+42" />