From 4ddcad91a5f07fce036cb74c722395ed62cd568b Mon Sep 17 00:00:00 2001 From: Alexey Homa <32689674+sasfmlzr@users.noreply.github.com> Date: Thu, 27 Sep 2018 21:32:33 +0300 Subject: [PATCH] #145 - Add themes to the app (#434) --- app/src/main/AndroidManifest.xml | 5 +- .../createpdf/activity/ImageEditor.java | 14 ++- .../activity/ImagesPreviewActivity.java | 12 ++- .../createpdf/activity/MainActivity.java | 9 +- .../createpdf/activity/PreviewActivity.java | 11 ++- .../createpdf/activity/RearrangeImages.java | 10 ++- .../createpdf/fragment/SettingsFragment.java | 47 ++++++++++ .../swati4star/createpdf/util/Constants.java | 6 ++ .../createpdf/util/SettingsOptions.java | 6 ++ .../swati4star/createpdf/util/ThemeUtils.java | 26 ++++++ .../baseline_settings_brightness_black_18.png | Bin 0 -> 243 bytes .../baseline_settings_brightness_black_24.png | Bin 0 -> 264 bytes .../baseline_settings_brightness_black_36.png | Bin 0 -> 378 bytes .../baseline_settings_brightness_black_48.png | Bin 0 -> 409 bytes .../baseline_settings_brightness_black_18.png | Bin 0 -> 175 bytes .../baseline_settings_brightness_black_24.png | Bin 0 -> 183 bytes .../baseline_settings_brightness_black_36.png | Bin 0 -> 264 bytes .../baseline_settings_brightness_black_48.png | Bin 0 -> 284 bytes .../baseline_settings_brightness_black_18.png | Bin 0 -> 264 bytes .../baseline_settings_brightness_black_24.png | Bin 0 -> 284 bytes .../baseline_settings_brightness_black_36.png | Bin 0 -> 409 bytes .../baseline_settings_brightness_black_48.png | Bin 0 -> 506 bytes .../baseline_settings_brightness_black_18.png | Bin 0 -> 378 bytes .../baseline_settings_brightness_black_24.png | Bin 0 -> 409 bytes .../baseline_settings_brightness_black_36.png | Bin 0 -> 586 bytes .../baseline_settings_brightness_black_48.png | Bin 0 -> 745 bytes .../baseline_settings_brightness_black_18.png | Bin 0 -> 409 bytes .../baseline_settings_brightness_black_24.png | Bin 0 -> 506 bytes .../baseline_settings_brightness_black_36.png | Bin 0 -> 745 bytes .../baseline_settings_brightness_black_48.png | Bin 0 -> 1062 bytes .../baseline_settings_brightness_24.xml | 10 +++ app/src/main/res/layout/activity_main.xml | 13 ++- .../main/res/layout/activity_photo_editor.xml | 13 +-- app/src/main/res/layout/activity_preview.xml | 13 +-- .../res/layout/activity_preview_images.xml | 10 +-- .../res/layout/activity_rearrange_images.xml | 14 ++- app/src/main/res/layout/bottom_sheet.xml | 9 +- .../res/layout/compress_image_default.xml | 3 - .../main/res/layout/compress_image_dialog.xml | 2 - app/src/main/res/layout/custom_dialog.xml | 1 - .../main/res/layout/dialog_theme_default.xml | 30 +++++++ app/src/main/res/layout/fragment_about_us.xml | 81 +++++++----------- .../res/layout/fragment_extract_images.xml | 16 ++-- app/src/main/res/layout/fragment_history.xml | 8 +- app/src/main/res/layout/fragment_home.xml | 8 +- .../res/layout/fragment_images_to_pdf.xml | 25 ++---- .../main/res/layout/fragment_merge_files.xml | 8 +- .../main/res/layout/fragment_remove_pages.xml | 4 +- app/src/main/res/layout/fragment_settings.xml | 6 +- .../main/res/layout/fragment_split_files.xml | 5 +- .../main/res/layout/fragment_text_to_pdf.xml | 15 ++-- .../main/res/layout/fragment_view_files.xml | 21 ++--- app/src/main/res/layout/item_file.xml | 2 - app/src/main/res/layout/item_merge_files.xml | 1 - .../res/layout/item_merge_selected_files.xml | 2 - .../res/layout/item_preview_image_options.xml | 3 - .../main/res/layout/item_rearrange_images.xml | 11 +-- .../layout/item_view_enhancement_option.xml | 4 +- .../main/res/layout/layout_item_history.xml | 1 - app/src/main/res/layout/list_item_filter.xml | 1 - app/src/main/res/layout/nav_header_main.xml | 31 ++++--- app/src/main/res/layout/pdf_preview_item.xml | 5 +- app/src/main/res/values-es/strings.xml | 5 ++ app/src/main/res/values-fr/strings.xml | 5 ++ app/src/main/res/values-ja/strings.xml | 5 ++ app/src/main/res/values-v21/styles.xml | 9 -- app/src/main/res/values/attrs.xml | 9 ++ app/src/main/res/values/colors.xml | 17 ++++ app/src/main/res/values/strings.xml | 5 ++ app/src/main/res/values/styles.xml | 64 +++++++++++--- 70 files changed, 394 insertions(+), 247 deletions(-) create mode 100644 app/src/main/java/swati4star/createpdf/util/ThemeUtils.java create mode 100755 app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_18.png create mode 100755 app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_24.png create mode 100755 app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_36.png create mode 100755 app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_48.png create mode 100755 app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_18.png create mode 100755 app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_24.png create mode 100755 app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_36.png create mode 100755 app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_48.png create mode 100755 app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_18.png create mode 100755 app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_24.png create mode 100755 app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_36.png create mode 100755 app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_48.png create mode 100755 app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_18.png create mode 100755 app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_24.png create mode 100755 app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_36.png create mode 100755 app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_48.png create mode 100755 app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_18.png create mode 100755 app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_24.png create mode 100755 app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_36.png create mode 100755 app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_48.png create mode 100755 app/src/main/res/drawable/baseline_settings_brightness_24.xml create mode 100644 app/src/main/res/layout/dialog_theme_default.xml delete mode 100644 app/src/main/res/values-v21/styles.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a88cee6c5..06af72497 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:label="@string/app_name" android:largeHeap="true" android:supportsRtl="true" - android:theme="@style/AppTheme" + android:theme="@style/AppThemeWhite" tools:ignore="GoogleAppIndexingWarning,RtlEnabled"> + android:screenOrientation="portrait"> diff --git a/app/src/main/java/swati4star/createpdf/activity/ImageEditor.java b/app/src/main/java/swati4star/createpdf/activity/ImageEditor.java index f52179927..3948d8664 100644 --- a/app/src/main/java/swati4star/createpdf/activity/ImageEditor.java +++ b/app/src/main/java/swati4star/createpdf/activity/ImageEditor.java @@ -3,9 +3,11 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.BitmapFactory; import android.os.Bundle; import android.os.Environment; +import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; @@ -33,6 +35,8 @@ import swati4star.createpdf.interfaces.OnItemClickListner; import swati4star.createpdf.model.BrushItem; import swati4star.createpdf.model.FilterItem; +import swati4star.createpdf.util.Constants; +import swati4star.createpdf.util.ThemeUtils; import static swati4star.createpdf.util.BrushUtils.getBrushItems; import static swati4star.createpdf.util.Constants.IMAGE_EDITOR_KEY; @@ -72,6 +76,10 @@ public class ImageEditor extends AppCompatActivity implements OnFilterItemClicke @Override protected void onCreate(Bundle savedInstanceState) { + SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + ThemeUtils.setThemeApp(themeName, this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_photo_editor); ButterKnife.bind(this); @@ -109,7 +117,9 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); mPhotoEditor.setBrushDrawingMode(false); - Objects.requireNonNull(getSupportActionBar()).hide(); + if (getSupportActionBar() != null) { + getSupportActionBar().hide(); + } } @OnClick(R.id.nextimageButton) @@ -354,7 +364,7 @@ public void onItemClick(int position) { mPhotoEditor.setBrushColor(getResources().getColor(color)); } - public static Intent getStartIntent(Context context, ArrayList uris) { + public static Intent getStartIntent(Context context, ArrayList uris) { Intent intent = new Intent(context, ImageEditor.class); intent.putExtra(IMAGE_EDITOR_KEY, uris); return intent; diff --git a/app/src/main/java/swati4star/createpdf/activity/ImagesPreviewActivity.java b/app/src/main/java/swati4star/createpdf/activity/ImagesPreviewActivity.java index 857fa2197..bf58468cf 100644 --- a/app/src/main/java/swati4star/createpdf/activity/ImagesPreviewActivity.java +++ b/app/src/main/java/swati4star/createpdf/activity/ImagesPreviewActivity.java @@ -2,7 +2,9 @@ import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; @@ -14,6 +16,8 @@ import butterknife.ButterKnife; import swati4star.createpdf.R; import swati4star.createpdf.adapter.PreviewAdapter; +import swati4star.createpdf.util.Constants; +import swati4star.createpdf.util.ThemeUtils; import static swati4star.createpdf.util.Constants.PREVIEW_IMAGES; @@ -21,6 +25,10 @@ public class ImagesPreviewActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + ThemeUtils.setThemeApp(themeName, this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_preview_images); @@ -33,7 +41,9 @@ protected void onCreate(Bundle savedInstanceState) { PreviewAdapter mPreviewAdapter = new PreviewAdapter(this, mImagesArrayList); mViewPager.setAdapter(mPreviewAdapter); mViewPager.setPageTransformer(true, new DepthPageTransformer()); - Objects.requireNonNull(getSupportActionBar()).hide(); + if (getSupportActionBar() != null) { + getSupportActionBar().hide(); + } } /** diff --git a/app/src/main/java/swati4star/createpdf/activity/MainActivity.java b/app/src/main/java/swati4star/createpdf/activity/MainActivity.java index 80f08dc82..c1701e771 100644 --- a/app/src/main/java/swati4star/createpdf/activity/MainActivity.java +++ b/app/src/main/java/swati4star/createpdf/activity/MainActivity.java @@ -32,7 +32,9 @@ import swati4star.createpdf.fragment.SplitFilesFragment; import swati4star.createpdf.fragment.TextToPdfFragment; import swati4star.createpdf.fragment.ViewFilesFragment; +import swati4star.createpdf.util.Constants; import swati4star.createpdf.util.FeedbackUtils; +import swati4star.createpdf.util.ThemeUtils; import static swati4star.createpdf.util.Constants.ACTION_MERGE_PDF; import static swati4star.createpdf.util.Constants.ACTION_SELECT_IMAGES; @@ -55,7 +57,12 @@ public class MainActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + ThemeUtils.setThemeApp(themeName, this); super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); Toolbar toolbar = findViewById(R.id.toolbar); @@ -87,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) { /** * Sets a fragment based on app shortcut selected, otherwise default + * * @return - instance of current fragment */ private Fragment checkForAppShortcutClicked() { @@ -131,7 +139,6 @@ private void initializeValues() { mFeedbackUtils = new FeedbackUtils(this); mNavigationView = findViewById(R.id.nav_view); mNavigationView.setNavigationItemSelectedListener(this); - mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); setDefaultMenuSelected(0); } diff --git a/app/src/main/java/swati4star/createpdf/activity/PreviewActivity.java b/app/src/main/java/swati4star/createpdf/activity/PreviewActivity.java index b7aac59b1..67cafe6cb 100644 --- a/app/src/main/java/swati4star/createpdf/activity/PreviewActivity.java +++ b/app/src/main/java/swati4star/createpdf/activity/PreviewActivity.java @@ -3,7 +3,9 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; @@ -23,6 +25,7 @@ import swati4star.createpdf.model.PreviewImageOptionItem; import swati4star.createpdf.util.Constants; import swati4star.createpdf.util.ImageSortUtils; +import swati4star.createpdf.util.ThemeUtils; import static swati4star.createpdf.util.Constants.PREVIEW_IMAGES; @@ -38,6 +41,10 @@ public class PreviewActivity extends AppCompatActivity implements PreviewImageOp @Override protected void onCreate(Bundle savedInstanceState) { + SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + ThemeUtils.setThemeApp(themeName, this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_preview); @@ -51,7 +58,9 @@ protected void onCreate(Bundle savedInstanceState) { mViewPager.setAdapter(mPreviewAdapter); mViewPager.setPageTransformer(true, new DepthPageTransformer()); - Objects.requireNonNull(getSupportActionBar()).hide(); + if (getSupportActionBar() != null) { + getSupportActionBar().hide(); + } showOptions(); } diff --git a/app/src/main/java/swati4star/createpdf/activity/RearrangeImages.java b/app/src/main/java/swati4star/createpdf/activity/RearrangeImages.java index b578d707d..9f8af8fa8 100644 --- a/app/src/main/java/swati4star/createpdf/activity/RearrangeImages.java +++ b/app/src/main/java/swati4star/createpdf/activity/RearrangeImages.java @@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; import android.view.MenuItem; import com.afollestad.materialdialogs.MaterialDialog; @@ -22,6 +23,7 @@ import swati4star.createpdf.R; import swati4star.createpdf.adapter.RearrangeImagesAdapter; import swati4star.createpdf.util.Constants; +import swati4star.createpdf.util.ThemeUtils; import static swati4star.createpdf.util.Constants.CHOICE_REMOVE_IMAGE; import static swati4star.createpdf.util.Constants.PREVIEW_IMAGES; @@ -38,9 +40,15 @@ public class RearrangeImages extends AppCompatActivity implements RearrangeImage @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + ThemeUtils.setThemeApp(themeName, this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_rearrange_images); - mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); ButterKnife.bind(this); Intent intent = getIntent(); diff --git a/app/src/main/java/swati4star/createpdf/fragment/SettingsFragment.java b/app/src/main/java/swati4star/createpdf/fragment/SettingsFragment.java index ea882c65e..3b60d1c80 100644 --- a/app/src/main/java/swati4star/createpdf/fragment/SettingsFragment.java +++ b/app/src/main/java/swati4star/createpdf/fragment/SettingsFragment.java @@ -37,6 +37,9 @@ import static swati4star.createpdf.util.Constants.DEFAULT_COMPRESSION; import static swati4star.createpdf.util.Constants.STORAGE_LOCATION; +import static swati4star.createpdf.util.Constants.THEME_BLACK; +import static swati4star.createpdf.util.Constants.THEME_DARK; +import static swati4star.createpdf.util.Constants.THEME_WHITE; import static swati4star.createpdf.util.DialogUtils.createCustomDialogWithoutContent; import static swati4star.createpdf.util.SettingsOptions.ImageEnhancementOptionsUtils.getEnhancementOptions; import static swati4star.createpdf.util.StringUtils.getDefaultStorageLocation; @@ -125,6 +128,9 @@ public void onItemClick(int position) { case 3: changeFontFamily(); break; + case 4: + setTheme(); + break; } } @@ -219,4 +225,45 @@ public void setPageSize() { MaterialDialog materialDialog = utils.showPageSizeDialog(R.layout.set_page_size_dialog_default, true); materialDialog.setOnDismissListener(dialog -> showSettingsOptions()); } + + /** + * To modify theme + */ + public void setTheme() { + String themeName = mSharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME); + + MaterialDialog.Builder builder = createCustomDialogWithoutContent(mActivity, + R.string.theme_edit); + MaterialDialog materialDialog = builder.customView(R.layout.dialog_theme_default, true) + .onPositive(((dialog, which) -> { + View view = dialog.getCustomView(); + RadioGroup radioGroup = view.findViewById(R.id.radio_group_themes); + int selectedId = radioGroup.getCheckedRadioButtonId(); + RadioButton radioButton = view.findViewById(selectedId); + String themeName1 = radioButton.getText().toString(); + SharedPreferences.Editor editor = mSharedPreferences.edit(); + editor.putString(Constants.DEFAULT_THEME_TEXT, themeName1); + editor.apply(); + mActivity.recreate(); + })) + .build(); + RadioGroup radioGroup = materialDialog.getCustomView().findViewById(R.id.radio_group_themes); + + int position = 0; + switch (themeName) { + case THEME_BLACK: + position = 0; + break; + case THEME_DARK: + position = 1; + break; + case THEME_WHITE: + position = 2; + break; + } + RadioButton rb = (RadioButton) radioGroup.getChildAt(position); + rb.setChecked(true); + materialDialog.show(); + } } diff --git a/app/src/main/java/swati4star/createpdf/util/Constants.java b/app/src/main/java/swati4star/createpdf/util/Constants.java index fc2bf3f39..e6ed48b8b 100644 --- a/app/src/main/java/swati4star/createpdf/util/Constants.java +++ b/app/src/main/java/swati4star/createpdf/util/Constants.java @@ -12,6 +12,8 @@ public class Constants { public static final String DATABASE_NAME = "ImagesToPdfDB.db"; public static final String DEFAULT_FONT_FAMILY_TEXT = "DefaultFontFamily"; public static final String DEFAULT_FONT_FAMILY = "TIMES_ROMAN"; + public static final String DEFAULT_THEME_TEXT = "DefaultTheme"; + public static final String DEFAULT_THEME = "White"; public static final String DEFAULT_IMAGE_BORDER_TEXT = "Image_border_text"; public static final String RESULT = "result"; public static final String DEFAULT_PAGE_SIZE_TEXT = "DefaultPageSize"; @@ -40,4 +42,8 @@ public class Constants { public static final String ACTION_TEXT_TO_PDF = "android.intent.action.TEXT_TO_PDF"; public static final String ACTION_MERGE_PDF = "android.intent.action.MERGE_PDF"; public static final String OPEN_SELECT_IMAGES = "open_select_images"; + + public static final String THEME_WHITE = "White"; + public static final String THEME_BLACK = "Black"; + public static final String THEME_DARK = "Dark"; } diff --git a/app/src/main/java/swati4star/createpdf/util/SettingsOptions.java b/app/src/main/java/swati4star/createpdf/util/SettingsOptions.java index 2d2ed15ac..2cf0efe8c 100644 --- a/app/src/main/java/swati4star/createpdf/util/SettingsOptions.java +++ b/app/src/main/java/swati4star/createpdf/util/SettingsOptions.java @@ -47,6 +47,12 @@ public static ArrayList getEnhancementOptions(Context String.format(context.getString(R.string.font_family_value_def), fontFamily.name()))); + options.add(new EnhancementOptionsEntity( + context.getResources().getDrawable(R.drawable.baseline_settings_brightness_24), + String.format(context.getString(R.string.theme_value_def), + sharedPreferences.getString(Constants.DEFAULT_THEME_TEXT, + Constants.DEFAULT_THEME)))); + return options; } } diff --git a/app/src/main/java/swati4star/createpdf/util/ThemeUtils.java b/app/src/main/java/swati4star/createpdf/util/ThemeUtils.java new file mode 100644 index 000000000..212b6b349 --- /dev/null +++ b/app/src/main/java/swati4star/createpdf/util/ThemeUtils.java @@ -0,0 +1,26 @@ +package swati4star.createpdf.util; + +import android.content.Context; + +import swati4star.createpdf.R; + +import static swati4star.createpdf.util.Constants.THEME_BLACK; +import static swati4star.createpdf.util.Constants.THEME_DARK; +import static swati4star.createpdf.util.Constants.THEME_WHITE; + +public class ThemeUtils { + + public static void setThemeApp(String theme, Context context) { + switch (theme) { + case THEME_WHITE: + context.setTheme(R.style.AppThemeWhite); + break; + case THEME_BLACK: + context.setTheme(R.style.AppThemeBlack); + break; + case THEME_DARK: + context.setTheme(R.style.ActivityThemeDark); + break; + } + } +} diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_18.png b/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_18.png new file mode 100755 index 0000000000000000000000000000000000000000..3950b2267997b71bfc630c00ac86c9f2a900d5de GIT binary patch literal 243 zcmVWuO26 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_24.png b/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_24.png new file mode 100755 index 0000000000000000000000000000000000000000..02bd43a7b06d6f1658e97f01c56eca0416a27bda GIT binary patch literal 264 zcmV+j0r&oiP)iKfF(sS@ zGP;V&Sl}Z)icme76^dAESXx_*Ra+aaw}qv%MTd&8HwGmn4I(q(f|&x5DJZ0BpyHPX z9dOklHZSq4fs(VGtv#o2AdZ;D+&T6DM8<{AJi!<=$IXXuvekeTfLw}skkN*{afdA& zzW^Qe7gGB~oUwDnsDnt6`Hzc@2|!uC{4*>KidYTa*-Omsm%r>OfxG~8S-#o(_8U6@ O0000cgP)bftE;Gnj#1Y0s)|?-r%)(j8(?g z>>DfQ`+&jzSiW7mv@$t4jtj;O_YB9M^q34bwAJR^wCJOx{t`Y4H z7jql?>}%h~J$;D5V8DSe_JSZB7(grr!ytC4CnNh&pZHN*W4C-E_SocK590hj3(UMa zVFS$1TqkUb>CAP)_81HqK`IPrKbHQJDe1@H)Es*NpLbL0gGx%%UlV1TpDyP(T9}-i YA5Na{4z{f3G5`Po07*qoM6N<$f^s^aVgLXD literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_48.png b/app/src/main/res/drawable-hdpi/baseline_settings_brightness_black_48.png new file mode 100755 index 0000000000000000000000000000000000000000..6b963cdd4e74414d3f460063f19cefa20f2123b9 GIT binary patch literal 409 zcmV;K0cQS*P)Ds^gMn0{wBcTW`T!GaCZ)d#L z1%d;f>jJ?Mt5Tq5BPi~I@H6edfn*KpXt%N|vxAhQqm6WX=LRW9M>{15DFaA2NuXVV zl5&C?R*9gU=;?|k11O24ohT;*D2b$vgp&c3M$+z-lL;iXe*~TDVzhpBeAM(VJLILV z&yP1k4WNC7+%O^FpRf)}Nmr$=L5hHsBpeHnl7wRcQj&0tLD16rUwU9xTIQAV00000NkvXXu0mjf DPRz0} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_18.png b/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_18.png new file mode 100755 index 0000000000000000000000000000000000000000..3c6c04c1468505ce8100ff71aa209d4628445e20 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m$~;{hLn;`P7ieW9Sv0VlHBZSf z{*%6=A^0Tgf;D{1&CC;u4kWUNh{XyjA7)WVIkNnPy@Va(#1;`lqmaZ5`B0jy^_^W}3Mc#S`=0+`C6lCiL}^aff@zzQ*_QD=%urNoTFJri YMY*72`$R8ipbHp0UHx3vIVCg!06y+JumAu6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_24.png b/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_24.png new file mode 100755 index 0000000000000000000000000000000000000000..e3d7a3a31b32a447ac6d7dc460cc108819d48738 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iI!_nJkP61Lml)X&2MDlSDDMfI zP`@~4IakR084Mo3-W#$y3WzzSG1!z{-<7VmS;T5~gWl194IN%e&lhBt9!S_Km8Ed} z+QGxinQrkN@ZKW4;d~tf|3;~E2Uo}+2rfykU9vsn>QeUjiQMOQy}#5ezQ^t3PczLj hX0>jST{G?&)`zDaJL39ye+1Aa44$rjF6*2Ung9}RM!En1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_36.png b/app/src/main/res/drawable-mdpi/baseline_settings_brightness_black_36.png new file mode 100755 index 0000000000000000000000000000000000000000..02bd43a7b06d6f1658e97f01c56eca0416a27bda GIT binary patch literal 264 zcmV+j0r&oiP)iKfF(sS@ zGP;V&Sl}Z)icme76^dAESXx_*Ra+aaw}qv%MTd&8HwGmn4I(q(f|&x5DJZ0BpyHPX z9dOklHZSq4fs(VGtv#o2AdZ;D+&T6DM8<{AJi!<=$IXXuvekeTfLw}skkN*{afdA& zzW^Qe7gGB~oUwDnsDnt6`Hzc@2|!uC{4*>KidYTa*-Omsm%r>OfxG~8S-#o(_8U6@ O0000!OYoYcwIyTEx;>zyKf|&QaG!HV9$zVn% zGv>$@G0K%AV-y%tBE~s0K-nP<*`r)s1Q!&kVue)sOTn7xDF_Hc@Dc>1O0X12O@2=R zQ#RZ^1pspjUjeLmSP0f1?tF_N#5RKPv8W4e+J=Hq(=~lP3(W+vM$pr<*h~QFt1C)v zikxbToV?m}$TqBH literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_18.png new file mode 100755 index 0000000000000000000000000000000000000000..02bd43a7b06d6f1658e97f01c56eca0416a27bda GIT binary patch literal 264 zcmV+j0r&oiP)iKfF(sS@ zGP;V&Sl}Z)icme76^dAESXx_*Ra+aaw}qv%MTd&8HwGmn4I(q(f|&x5DJZ0BpyHPX z9dOklHZSq4fs(VGtv#o2AdZ;D+&T6DM8<{AJi!<=$IXXuvekeTfLw}skkN*{afdA& zzW^Qe7gGB~oUwDnsDnt6`Hzc@2|!uC{4*>KidYTa*-Omsm%r>OfxG~8S-#o(_8U6@ O0000!OYoYcwIyTEx;>zyKf|&QaG!HV9$zVn% zGv>$@G0K%AV-y%tBE~s0K-nP<*`r)s1Q!&kVue)sOTn7xDF_Hc@Dc>1O0X12O@2=R zQ#RZ^1pspjUjeLmSP0f1?tF_N#5RKPv8W4e+J=Hq(=~lP3(W+vM$pr<*h~QFt1C)v zikxbToV?m}$TqBH literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_36.png new file mode 100755 index 0000000000000000000000000000000000000000..6b963cdd4e74414d3f460063f19cefa20f2123b9 GIT binary patch literal 409 zcmV;K0cQS*P)Ds^gMn0{wBcTW`T!GaCZ)d#L z1%d;f>jJ?Mt5Tq5BPi~I@H6edfn*KpXt%N|vxAhQqm6WX=LRW9M>{15DFaA2NuXVV zl5&C?R*9gU=;?|k11O24ohT;*D2b$vgp&c3M$+z-lL;iXe*~TDVzhpBeAM(VJLILV z&yP1k4WNC7+%O^FpRf)}Nmr$=L5hHsBpeHnl7wRcQj&0tLD16rUwU9xTIQAV00000NkvXXu0mjf DPRz0} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_settings_brightness_black_48.png new file mode 100755 index 0000000000000000000000000000000000000000..32c09b1503e61c385393c08b1137dd2f33d7ed4f GIT binary patch literal 506 zcmVJT!ig+><1|9w*HrpS)byji>qI6&OY|LxKJ=CA6AfAsiKuugBL1S-k+DzS z_xj}hl1py(ZinboQ4~c{6h*Uaa>)bMv3cN#yl@>058lVZDEdP3+c)gV1)GS3h;zvU#4s6egOzT00JOM0|uS}3ByR90J^>s zx(m?th2Q`n>kGjFK-X77X8=|<{~i#408F#U3WwZ#1-v)GIyasH0FxZ~1_11O2aIv% z8vs+>b_XzM0f05^V+MZ-NLVYtIM;ecst-s7UsQXT66yjHRsdMWlu#3pup+<$ri6Nc zgcSm2FeTIj42uB`CNr!Dfc)zpp$s(vkc$9Ix_)f{1BJvM&tp+0_AiC^Xd5P%lX3qwzTF=h0;j~{>%GWY=~ zA%h=)5;AxNKqi9&Kyd*GKmY>ph&h_afB5S0wkyCk(wwW;@B5(b`@R4HJ+6FTL4k(j w&R+sLrs2o>q>f(0x**Z#qbQ1^D2k%!4LGuD+iA#dLjV8(07*qoM6N<$g4bHnz5oCK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_18.png new file mode 100755 index 0000000000000000000000000000000000000000..b11fe50262eef7eaaa82e871ac2dbe33565f1fea GIT binary patch literal 378 zcmV-=0fqjFP)cgP)bftE;Gnj#1Y0s)|?-r%)(j8(?g z>>DfQ`+&jzSiW7mv@$t4jtj;O_YB9M^q34bwAJR^wCJOx{t`Y4H z7jql?>}%h~J$;D5V8DSe_JSZB7(grr!ytC4CnNh&pZHN*W4C-E_SocK590hj3(UMa zVFS$1TqkUb>CAP)_81HqK`IPrKbHQJDe1@H)Es*NpLbL0gGx%%UlV1TpDyP(T9}-i YA5Na{4z{f3G5`Po07*qoM6N<$f^s^aVgLXD literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_24.png new file mode 100755 index 0000000000000000000000000000000000000000..6b963cdd4e74414d3f460063f19cefa20f2123b9 GIT binary patch literal 409 zcmV;K0cQS*P)Ds^gMn0{wBcTW`T!GaCZ)d#L z1%d;f>jJ?Mt5Tq5BPi~I@H6edfn*KpXt%N|vxAhQqm6WX=LRW9M>{15DFaA2NuXVV zl5&C?R*9gU=;?|k11O24ohT;*D2b$vgp&c3M$+z-lL;iXe*~TDVzhpBeAM(VJLILV z&yP1k4WNC7+%O^FpRf)}Nmr$=L5hHsBpeHnl7wRcQj&0tLD16rUwU9xTIQAV00000NkvXXu0mjf DPRz0} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_settings_brightness_black_36.png new file mode 100755 index 0000000000000000000000000000000000000000..21d9cd422007e70c5c2d2fc33b765bcee3679c42 GIT binary patch literal 586 zcmV-Q0=4~#P)GCGeK zL8ks(AsL>l^rva-NXBO!8a;Ss9`=+TNRvnoW-?NT3s?uzQu(E`tZ4B$EBARR(hB*d z6|`*m`)mdluz&?DU=11`VGZ7XooNnW!b&8e*@Ov8X$E1!5}HYvu!Lq6CM=;@fu%n* z0Sj2b%3+&1z!_fogLT!1Iqc`NKUh~2IO`Jz-P!F1Cav)bgJWJ{eYn`lutqTqrhoH0 zjruTM)GdR-DP26S4--}aY(7b7)nURafc4{@&?>`}RRV+aB%xJ=DXSEAl%%v;FlCj) zwvjTl3b5I{|6{PNO<|1+up(N%qZw8OSP3oP`3$QLOljpG_sXgOE2iaIsH_^Wa$2sF z!g8??JXIEgovgN8@VP#Ag5(jl%IC(M9kKb%%m&j#zBZU{=Ah3_+&TdZSilO?#p8k{ z_|}6dO<4wEN>i3mn9_u06{a*{S%oQ0SaBd`96B4YKUKg27O*8=PqXSIIhfA>=v2lY zJoS0mK8LUiM;$*9(){bT!- z1s)5!LPRwgmMCR1WpYmB&|(PXRWW1GQ{Z5f;s|lw%E_R?aGH(bgv;ieN%=ep_lnKW z72T?xXMf=72j-gZ_udDo8pFWmzjq!h8|w(%F4;fxA@lc}$Cp_j@($~0%$Ye|CQZ0^ zlM7Fdch9DSaze~^m47{!GQ6?2Xzo0|O&&ZI-7<@As2G0OyX-MZX#GlN<3 zy0%0znS0-oXWH%%rE+_nt5GA1kcR@0Sh15uC}U1x_^;l5WP*&Vv9P^O%Gt<=bw@&KXab79E=DLpq zNXCY-Xw5I3SlM_geeRR#4o^3`MYt+>*}5y7s=b}(@OWzDx%Ip2{?xNcDQhtw-2F#= z>$k?Dc~uV6JLjyZT`*_4*ag12XD+?Wp$|BJRl7cMdCUCNW@|&9uw~$H2TOn51>P=x zSL_1L1#`a;nJB!KZ_4K@%(uL!bVjkw`oZo{-Em0m7F$!^=|(@{msS~4E0_Z7l~d;} zYt$0>`d#69rW{Bhzi8ewkigdNqjQ#5F5q&hjXhg=i+z>jmFu_XEU#T4cbnq`p$&0;^s6^_;-7{UuyeZQ#I_RlLV{K?CjbkSW#{SFtN+AyWM$Z|{(E>#HdyVB@j8OYA` z6etkl2aJy_J!r&4DHL!oIV-rs^3pQSJ0_X_oOgmR^$G5HTxYj>i)WYYA^r_tOKLAT zTwk#Nc=OZBGi*fR`9-nw=NtVySp9BuKi5n+_{(Zs_OV9Vx^z7-2{U-Q L`njxgN@xNAuIN4j literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_18.png new file mode 100755 index 0000000000000000000000000000000000000000..6b963cdd4e74414d3f460063f19cefa20f2123b9 GIT binary patch literal 409 zcmV;K0cQS*P)Ds^gMn0{wBcTW`T!GaCZ)d#L z1%d;f>jJ?Mt5Tq5BPi~I@H6edfn*KpXt%N|vxAhQqm6WX=LRW9M>{15DFaA2NuXVV zl5&C?R*9gU=;?|k11O24ohT;*D2b$vgp&c3M$+z-lL;iXe*~TDVzhpBeAM(VJLILV z&yP1k4WNC7+%O^FpRf)}Nmr$=L5hHsBpeHnl7wRcQj&0tLD16rUwU9xTIQAV00000NkvXXu0mjf DPRz0} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_24.png new file mode 100755 index 0000000000000000000000000000000000000000..32c09b1503e61c385393c08b1137dd2f33d7ed4f GIT binary patch literal 506 zcmVJT!ig+><1|9w*HrpS)byji>qI6&OY|LxKJ=CA6AfAsiKuugBL1S-k+DzS z_xj}hl1py(ZinboQ4~c{6h*Uaa>)bMv3cN#yl@>058lVZDEdP3+c)gV1)GS3h;zvU#4s6egOzT00JOM0|uS}3ByR90J^>s zx(m?th2Q`n>kGjFK-X77X8=|<{~i#408F#U3WwZ#1-v)GIyasH0FxZ~1_11O2aIv% z8vs+>b_XzM0f05^V+MZ-NLVYtIM;ecst-s7UsQXT66yjHRsdMWlu#3pup+<$ri6Nc zgcSm2FeTIj42uB`CNr!Dfc)zpp$s(vkc$9Ix_)f{1BJvM&tp+0_AiC^Xd5P%lX3qwzTF=h0;j~{>%GWY=~ zA%h=)5;AxNKqi9&Kyd*GKmY>ph&h_afB5S0wkyCk(wwW;@B5(b`@R4HJ+6FTL4k(j w&R+sLrs2o>q>f(0x**Z#qbQ1^D2k%!4LGuD+iA#dLjV8(07*qoM6N<$g4bHnz5oCK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_36.png new file mode 100755 index 0000000000000000000000000000000000000000..b13b747e756f6bebcbc36ac39d81f3ba08b32ac9 GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFm3R3aSW+oe0!HMB`i>){bT!- z1s)5!LPRwgmMCR1WpYmB&|(PXRWW1GQ{Z5f;s|lw%E_R?aGH(bgv;ieN%=ep_lnKW z72T?xXMf=72j-gZ_udDo8pFWmzjq!h8|w(%F4;fxA@lc}$Cp_j@($~0%$Ye|CQZ0^ zlM7Fdch9DSaze~^m47{!GQ6?2Xzo0|O&&ZI-7<@As2G0OyX-MZX#GlN<3 zy0%0znS0-oXWH%%rE+_nt5GA1kcR@0Sh15uC}U1x_^;l5WP*&Vv9P^O%Gt<=bw@&KXab79E=DLpq zNXCY-Xw5I3SlM_geeRR#4o^3`MYt+>*}5y7s=b}(@OWzDx%Ip2{?xNcDQhtw-2F#= z>$k?Dc~uV6JLjyZT`*_4*ag12XD+?Wp$|BJRl7cMdCUCNW@|&9uw~$H2TOn51>P=x zSL_1L1#`a;nJB!KZ_4K@%(uL!bVjkw`oZo{-Em0m7F$!^=|(@{msS~4E0_Z7l~d;} zYt$0>`d#69rW{Bhzi8ewkigdNqjQ#5F5q&hjXhg=i+z>jmFu_XEU#T4cbnq`p$&0;^s6^_;-7{UuyeZQ#I_RlLV{K?CjbkSW#{SFtN+AyWM$Z|{(E>#HdyVB@j8OYA` z6etkl2aJy_J!r&4DHL!oIV-rs^3pQSJ0_X_oOgmR^$G5HTxYj>i)WYYA^r_tOKLAT zTwk#Nc=OZBGi*fR`9-nw=NtVySp9BuKi5n+_{(Zs_OV9Vx^z7-2{U-Q L`njxgN@xNAuIN4j literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_settings_brightness_black_48.png new file mode 100755 index 0000000000000000000000000000000000000000..fdde73a65726a2adf6bf3b0d2134ea0c9e9531e6 GIT binary patch literal 1062 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJf%&bci(^OypJNhg7W?Rf-waR4IOLp-w)YMC6zjo!=oMYujt`y%dl#(`1 zz5Rh>KDy;YC)PeXnOhK5+n`GIl`3=Fq7AF=@P_g3l(J22dsvzz4vO9Sst zrv@K}25*)VtT!g?W(A6zt&9eWSj-4zG-7-Z!}xFQ=4-qO^ZGmMZ$>(^X&i~VelTC# znN{P+E~cD==AuoGj8j^kf7VyhVrgd7aA7)N=+c^?z|iW!*x;|t(#)XYB6UF4Wp2VY zMy`n*1zdsZGg2FzmN4lEPMsRbrr~0A;GaurY8X(GZ-cF4ZK@a}m!sVQrHfgq-x$uR z$um6b2(zyK#;`z9KEb-_m(&bbhKx&$-(Elbvy$N_%jB(B4*v{h{KToY`pS9x*9;d_ znC?W`{%2rV;K}@BQQbd928YQ^1tEX`I5Re=F+MmXcWyq<1pf>BbboAX|E$jZM0m^l zDL^qkpxCxbyH#`Qr!m$fPs{iHQ@DX)pXK%K%kR(r`Jbbp^4b5#?o-yC{9Vs-qo?}Q zKY7M)k4v2z_V8!b`=>B)Y>2)WF3M405&kn(_BH>81BG)=@Ycol#@|qBU|`}NWUyhCO`u3j{Kr(kiw`ye2FI^(Ke59jrt$KH6H4&%7~Gc4n-lD@#Y%eIG= zgtr*W3$EK-d*++ZjmACBJN&-Mu^YJF{$TO&+8*_rZJM(mo45hAtNG z++vRTm0VIfedo~TniH$q*XEpYw>j>sv-yC6F*?|MpCS1F%0DKGF%rQ1&*16m=d#Wz Gp$Py1rMgN0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/baseline_settings_brightness_24.xml b/app/src/main/res/drawable/baseline_settings_brightness_24.xml new file mode 100755 index 000000000..bb7d8da86 --- /dev/null +++ b/app/src/main/res/drawable/baseline_settings_brightness_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b3701ca08..42040bb58 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,15 +18,13 @@ + android:layout_height="wrap_content"> + android:layout_height="?android:attr/actionBarSize" /> @@ -34,8 +32,7 @@ android:id="@+id/content" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="56dp" - android:background="@color/mb_white" /> + android:layout_marginTop="56dp"/> @@ -46,6 +43,6 @@ android:layout_gravity="start" android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" - app:menu="@menu/activity_main_drawer" /> + app:menu="@menu/activity_main_drawer"/> diff --git a/app/src/main/res/layout/activity_photo_editor.xml b/app/src/main/res/layout/activity_photo_editor.xml index 577e8d3fd..2c98530f9 100644 --- a/app/src/main/res/layout/activity_photo_editor.xml +++ b/app/src/main/res/layout/activity_photo_editor.xml @@ -20,8 +20,7 @@ android:layout_marginStart="5dp" android:background="@drawable/cornered_edges" android:text="@string/reset" - android:textAllCaps="false" - android:textColor="@android:color/white" /> + android:textAllCaps="false" />