UI : Aesthetic changes [1/3]

This commit is contained in:
Rahul Kumar Patel
2019-09-20 00:25:39 +05:30
parent 141ced893a
commit 7689720dcf
67 changed files with 450 additions and 330 deletions

View File

@@ -76,6 +76,7 @@ dependencies {
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
implementation 'com.google.android.material:material:1.1.0-alpha10'
implementation 'androidx.palette:palette:1.0.0'
//Utils
implementation 'androidx.annotation:annotation:1.1.0'
implementation 'org.apache.commons:commons-text:1.4'

View File

@@ -170,6 +170,9 @@
</intent-filter>
</receiver>
<service android:name=".installer.InstallerService" />
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
</application>
</manifest>

View File

@@ -21,6 +21,7 @@
package com.aurora.store.activity;
import android.Manifest;
import android.app.StatusBarManager;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -85,7 +86,6 @@ public class AuroraActivity extends AppCompatActivity {
ButterKnife.bind(this);
fragmentCur = Util.getDefaultTab(this);
onNewIntent(getIntent());
if (!PrefUtil.getBoolean(this, Constants.PREFERENCE_DO_NOT_SHOW_INTRO)) {
PrefUtil.putBoolean(this, Constants.PREFERENCE_DO_NOT_SHOW_INTRO, true);
startActivity(new Intent(this, IntroActivity.class));

View File

@@ -34,6 +34,8 @@ import com.aurora.store.model.App;
import com.aurora.store.utility.PackageUtil;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import com.bumptech.glide.request.RequestOptions;
@@ -104,6 +106,7 @@ public class FavouriteAppsAdapter extends RecyclerView.Adapter {
.load(app.getIconInfo().getUrl())
.apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.ALL))
.transition(new DrawableTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(25))
.into(holder.AppIcon);
holder.setChecked(isSelected(appList.get(position)));

View File

@@ -110,8 +110,8 @@ public class FeaturedAppsAdapter extends RecyclerView.Adapter<FeaturedAppsAdapte
? app.getPageBackgroundImage().getUrl()
: app.getIconInfo().getUrl())
.placeholder(R.color.colorTransparent)
.transforms(new CenterCrop(), new RoundedCorners(15))
.transition(new BitmapTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(50))
.into(holder.imgIcon);
}

View File

@@ -40,6 +40,8 @@ import com.aurora.store.activity.AuroraActivity;
import com.aurora.store.activity.DetailsActivity;
import com.aurora.store.model.App;
import com.aurora.store.sheet.AppMenuSheet;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import java.util.ArrayList;
@@ -145,6 +147,7 @@ public class InstalledAppsAdapter extends RecyclerView.Adapter<InstalledAppsAdap
.with(context)
.load(app.getIconInfo().getUrl())
.transition(new DrawableTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(30))
.into(holder.AppIcon);
}

View File

@@ -72,12 +72,12 @@ public class SmallScreenshotsAdapter extends RecyclerView.Adapter<SmallScreensho
GlideApp.with(context)
.load(URLs.get(position)).diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
.transition(new DrawableTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(15))
.transforms(new CenterCrop(), new RoundedCorners(25))
.into(new SimpleTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition<? super Drawable> transition) {
holder.imageView.getLayoutParams().width = drawable.getIntrinsicWidth();
holder.imageView.getLayoutParams().height = ViewUtil.dpToPx(context, 180);
holder.imageView.getLayoutParams().height = drawable.getIntrinsicHeight();
holder.imageView.setImageDrawable(drawable);
}
});

View File

@@ -34,7 +34,6 @@ import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.core.graphics.ColorUtils;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.recyclerview.widget.RecyclerView;
@@ -43,6 +42,7 @@ import com.aurora.store.SharedPreferencesTranslator;
import com.aurora.store.fragment.CategoriesFragment;
import com.aurora.store.fragment.CategoryAppsFragment;
import com.aurora.store.fragment.HomeFragment;
import com.aurora.store.utility.ColorUtil;
import com.aurora.store.utility.Util;
import com.aurora.store.utility.ViewUtil;
@@ -90,9 +90,9 @@ public class TopCategoriesAdapter extends RecyclerView.Adapter<TopCategoriesAdap
holder.itemView.setBackgroundTintList(ColorStateList.valueOf(
ColorUtils.setAlphaComponent(color, isTransparent ? 60 : 255)));
holder.imgCat.setImageDrawable(context.getResources().getDrawable(categoriesImg[position]));
holder.imgCat.setColorFilter(isTransparent ? color : Color.WHITE);
holder.imgCat.setColorFilter(isTransparent ? ColorUtil.manipulateColor(color, 0.85f) : Color.WHITE);
holder.txtCat.setText(translator.getString(topCategoryIDs[position]));
holder.txtCat.setTextColor(isTransparent ? color : Color.WHITE);
holder.txtCat.setTextColor(isTransparent ? ColorUtil.manipulateColor(color, 0.75f) : Color.WHITE);
if (topCategoryIDs[position].equals(CategoriesFragment.FAMILY)) {
holder.itemView.setOnClickListener(v -> getSubCategoryFragment(CategoriesFragment.FAMILY));
@@ -120,7 +120,6 @@ public class TopCategoriesAdapter extends RecyclerView.Adapter<TopCategoriesAdap
arguments.putString("CategoryId", topCategoryIDs[position]);
arguments.putString("CategoryName", translator.getString(topCategoryIDs[position]));
categoryAppsFragment.setArguments(arguments);
FragmentManager manager = fragment.getFragmentManager();
fragment.getChildFragmentManager()
.beginTransaction()
.replace(R.id.coordinator, categoryAppsFragment)

View File

@@ -42,6 +42,8 @@ import com.aurora.store.activity.DetailsActivity;
import com.aurora.store.model.App;
import com.aurora.store.sheet.AppMenuSheet;
import com.aurora.store.utility.ViewUtil;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import java.util.ArrayList;
@@ -148,6 +150,7 @@ public class UpdatableAppsAdapter extends RecyclerView.Adapter<UpdatableAppsAdap
.with(context)
.load(app.getIconInfo().getUrl())
.transition(new DrawableTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(25))
.into(viewHolder.imgIcon);
viewHolder.imgExpand.setOnClickListener(v -> {

View File

@@ -22,11 +22,17 @@ package com.aurora.store.fragment.details;
import android.content.Context;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.IdRes;
import androidx.core.graphics.ColorUtils;
import androidx.core.view.ViewCompat;
import androidx.fragment.app.FragmentTransaction;
import com.aurora.store.Constants;
@@ -154,4 +160,35 @@ public abstract class AbstractHelper {
Log.e("No WebView found !");
}
}
protected void paintButton(@IdRes int buttonId, @ColorInt int color) {
android.widget.Button button = view.findViewById(buttonId);
if (button != null)
ViewCompat.setBackgroundTintList(button, ColorStateList.valueOf(color));
}
protected void paintTextView(@IdRes int textViewId, @ColorInt int color) {
TextView textView = view.findViewById(textViewId);
if (textView != null)
textView.setTextColor(color);
}
protected void paintTextViewBg(@IdRes int textViewId, @ColorInt int color, int alpha) {
TextView textView = view.findViewById(textViewId);
if (textView != null)
textView.setBackgroundColor(ColorUtils.setAlphaComponent(color, alpha));
}
protected void paintLayout(@IdRes int viewId, @ColorInt int color) {
ViewGroup viewGroup = view.findViewById(viewId);
if (viewGroup != null)
viewGroup.setBackgroundColor(color);
}
protected void paintLayout(@IdRes int viewId, @ColorInt int color, int alpha) {
ViewGroup viewGroup = view.findViewById(viewId);
if (viewGroup != null)
viewGroup.setBackgroundColor(ColorUtils.setAlphaComponent(color, alpha));
}
}

View File

@@ -121,7 +121,7 @@ public class ActionButton extends AbstractHelper {
@Override
public void draw() {
boolean isInstalled = PackageUtil.isInstalled(context, app);
boolean isInstalled = app.isInstalled();
hashCode = app.getPackageName().hashCode();
ViewUtil.setVisibility(btnNegative, isInstalled);
btnNegative.setOnClickListener(uninstallAppListener());

View File

@@ -22,26 +22,43 @@ package com.aurora.store.fragment.details;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.ColorStateList;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.text.Html;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.text.util.Linkify;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.core.graphics.ColorUtils;
import androidx.palette.graphics.Palette;
import com.aurora.store.GlideApp;
import com.aurora.store.R;
import com.aurora.store.fragment.DetailsFragment;
import com.aurora.store.manager.CategoryManager;
import com.aurora.store.model.App;
import com.aurora.store.sheet.MoreInfoSheet;
import com.aurora.store.utility.ColorUtil;
import com.aurora.store.utility.Log;
import com.aurora.store.utility.TextUtil;
import com.aurora.store.utility.ThemeUtil;
import com.aurora.store.utility.Util;
import com.aurora.store.utility.ViewUtil;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.chip.Chip;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -58,10 +75,14 @@ public class GeneralDetails extends AbstractHelper {
ImageView appIcon;
@BindView(R.id.devName)
TextView txtDevName;
@BindView(R.id.showLessMoreTxt)
TextView showLessMoreTxt;
@BindView(R.id.app_desc_short)
TextView txtDescShort;
@BindView(R.id.img_more)
ImageButton imgMore;
@BindView(R.id.versionString)
TextView app_version;
@BindView(R.id.txt_new)
TextView txtNew;
@BindView(R.id.txt_updated)
Chip txtUpdated;
@BindView(R.id.txt_google_dependencies)
@@ -76,6 +97,10 @@ public class GeneralDetails extends AbstractHelper {
Chip category;
@BindView(R.id.developer_layout)
LinearLayout developerLayout;
@BindView(R.id.btn_positive)
MaterialButton btnPositive;
@BindView(R.id.btn_negative)
MaterialButton btnNegative;
public GeneralDetails(DetailsFragment fragment, App app) {
super(fragment, app);
@@ -95,8 +120,22 @@ public class GeneralDetails extends AbstractHelper {
private void drawAppBadge() {
if (view != null) {
GlideApp.with(context)
.asBitmap()
.load(app.getIconInfo().getUrl())
.transition(new DrawableTransitionOptions().crossFade())
.transition(new BitmapTransitionOptions().crossFade())
.transforms(new CenterCrop(), new RoundedCorners(50))
.listener(new RequestListener<Bitmap>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
return false;
}
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
getPalette(resource);
return false;
}
})
.into(appIcon);
setText(view, R.id.displayName, app.getDisplayName());
setText(view, R.id.packageName, app.getPackageName());
@@ -106,6 +145,47 @@ public class GeneralDetails extends AbstractHelper {
}
}
private void getPalette(Bitmap bitmap) {
Palette.from(bitmap).generate(palette -> {
if (palette != null)
paintEmAll(palette);
});
}
private void paintEmAll(Palette palette) {
Palette.Swatch swatch = palette.getDarkVibrantSwatch();
int colorPrimary = Color.GRAY;
int colorPrimaryText = Color.BLACK;
//Make sure we get a fallback swatch if DarkVibrantSwatch is not available
if (swatch == null)
swatch = palette.getVibrantSwatch();
//Make sure we get another fallback swatch if VibrantSwatch is not available
if (swatch == null)
swatch = palette.getDominantSwatch();
if (swatch != null) {
colorPrimary = swatch.getRgb();
colorPrimaryText = ColorUtil.manipulateColor(colorPrimary, 0.3f);
}
if (ColorUtil.isColorLight(colorPrimary))
btnPositive.setTextColor(Color.BLACK);
else
btnPositive.setTextColor(Color.WHITE);
btnPositive.setBackgroundColor(colorPrimary);
btnPositive.setStrokeColor(ColorStateList.valueOf(colorPrimary));
if (ThemeUtil.isLightTheme(context)) {
txtDevName.setTextColor(colorPrimaryText);
txtNew.setTextColor(colorPrimaryText);
txtDescShort.setTextColor(colorPrimaryText);
txtDescShort.setBackgroundTintList(ColorStateList.valueOf(ColorUtils.setAlphaComponent(colorPrimary, 60)));
}
}
private void drawGeneralDetails() {
if (context != null) {
if (app.isEarlyAccess()) {
@@ -146,9 +226,9 @@ public class GeneralDetails extends AbstractHelper {
private void drawChanges() {
String changes = app.getChanges();
if (TextUtil.isEmpty(changes))
setText(view, R.id.changes_upper, context.getString(R.string.details_no_changes));
setText(view, R.id.txt_changelog, context.getString(R.string.details_no_changes));
else
setText(view, R.id.changes_upper, Html.fromHtml(changes).toString());
setText(view, R.id.txt_changelog, Html.fromHtml(changes).toString());
show(view, R.id.changes_container);
}
@@ -228,15 +308,15 @@ public class GeneralDetails extends AbstractHelper {
private void drawDescription() {
if (context != null) {
if (TextUtils.isEmpty(app.getDescription())) {
hide(view, R.id.more_card);
hide(view, R.id.more_layout);
} else {
show(view, R.id.more_card);
show(view, R.id.more_layout);
}
}
}
private void setupReadMore() {
showLessMoreTxt.setOnClickListener(v -> {
imgMore.setOnClickListener(v -> {
MoreInfoSheet mDetailsFragmentMore = new MoreInfoSheet();
mDetailsFragmentMore.setApp(app);
mDetailsFragmentMore.show(fragment.getChildFragmentManager(), "MORE");

View File

@@ -24,6 +24,7 @@ import android.content.Context;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RatingBar;
@@ -61,8 +62,8 @@ import io.reactivex.schedulers.Schedulers;
public class Reviews extends AbstractHelper {
@BindView(R.id.txt_readAll)
TextView txtReadAll;
@BindView(R.id.img_review)
ImageButton imgReview;
@BindView(R.id.average_rating)
TextView txtAverageRating;
@BindView(R.id.count_stars)
@@ -250,7 +251,7 @@ public class Reviews extends AbstractHelper {
}
private void setupLoadMore() {
txtReadAll.setOnClickListener(v -> {
imgReview.setOnClickListener(v -> {
ReviewsBottomSheet mDetailsFragmentMore = new ReviewsBottomSheet(app);
mDetailsFragmentMore.show(fragment.getChildFragmentManager(), "REVIEWS");
});

View File

@@ -91,7 +91,7 @@ public class Video extends AbstractHelper {
GlideApp
.with(context)
.load(jsonObject.getString("thumbnail_url"))
.transforms(new CenterCrop(), new RoundedCorners(15))
.transforms(new CenterCrop(), new RoundedCorners(25))
.transition(new DrawableTransitionOptions().crossFade())
.into(video_thumbnail);
}, throwable -> {

View File

@@ -131,6 +131,6 @@ public class AuroraSuggestionProvider extends ContentProvider {
}
private Object[] constructSuggestionRow(SearchSuggestEntry entry, int id) {
return new Object[]{id, entry.getSuggestedQuery(), entry.getSuggestedQuery(), R.drawable.ic_search};
return new Object[]{id, entry.getSuggestedQuery(), entry.getSuggestedQuery(), R.drawable.ic_round_search};
}
}

View File

@@ -47,7 +47,7 @@ import com.aurora.store.model.App;
import com.aurora.store.utility.ApkCopier;
import com.aurora.store.utility.Log;
import com.aurora.store.utility.PackageUtil;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.button.MaterialButton;
import butterknife.BindView;
@@ -57,7 +57,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class AppMenuSheet extends CustomBottomSheetDialogFragment {
public class AppMenuSheet extends BottomSheetDialogFragment {
@BindView(R.id.menu_title)
TextView txtTitle;
@@ -148,7 +148,7 @@ public class AppMenuSheet extends CustomBottomSheetDialogFragment {
});
btnLocal.setOnClickListener(v -> {
disposable.add(Observable.fromCallable(() -> new ApkCopier(context,app)
disposable.add(Observable.fromCallable(() -> new ApkCopier(context, app)
.copy())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())

View File

@@ -34,7 +34,7 @@ import androidx.annotation.Nullable;
import com.aurora.store.R;
import com.aurora.store.download.DownloadManager;
import com.aurora.store.utility.Util;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.button.MaterialButton;
import com.tonyodev.fetch2.Download;
import com.tonyodev.fetch2.Fetch;
@@ -43,7 +43,7 @@ import com.tonyodev.fetch2.Status;
import butterknife.BindView;
import butterknife.ButterKnife;
public class DownloadMenuSheet extends CustomBottomSheetDialogFragment {
public class DownloadMenuSheet extends BottomSheetDialogFragment {
@BindView(R.id.menu_title)
TextView downloadTitle;

View File

@@ -40,7 +40,8 @@ import com.aurora.store.adapter.ExodusAdapter;
import com.aurora.store.model.ExodusTracker;
import com.aurora.store.model.Report;
import com.aurora.store.utility.Log;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import org.json.JSONArray;
import org.json.JSONException;
@@ -55,7 +56,7 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
public class ExodusBottomSheet extends CustomBottomSheetDialogFragment {
public class ExodusBottomSheet extends BottomSheetDialogFragment {
@BindView(R.id.exodus_recycler)
RecyclerView recyclerView;
@@ -79,6 +80,12 @@ public class ExodusBottomSheet extends CustomBottomSheetDialogFragment {
this.context = context;
}
@Override
public void onStart() {
super.onStart();
getDialog().getBehavior().setState(BottomSheetBehavior.STATE_EXPANDED);
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

View File

@@ -35,14 +35,15 @@ import androidx.core.graphics.ColorUtils;
import com.aurora.store.Constants;
import com.aurora.store.R;
import com.aurora.store.utility.PrefUtil;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.chip.Chip;
import com.google.android.material.chip.ChipGroup;
import butterknife.BindView;
import butterknife.ButterKnife;
public class FilterBottomSheet extends CustomBottomSheetDialogFragment {
public class FilterBottomSheet extends BottomSheetDialogFragment {
@BindView(R.id.rating_chips)
ChipGroup rating_chips;
@@ -66,6 +67,12 @@ public class FilterBottomSheet extends CustomBottomSheetDialogFragment {
this.context = context;
}
@Override
public void onStart() {
super.onStart();
getDialog().getBehavior().setState(BottomSheetBehavior.STATE_EXPANDED);
}
@NonNull
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

View File

@@ -33,12 +33,13 @@ import androidx.annotation.Nullable;
import com.aurora.store.R;
import com.aurora.store.model.App;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import butterknife.BindView;
import butterknife.ButterKnife;
public class MoreInfoSheet extends CustomBottomSheetDialogFragment {
public class MoreInfoSheet extends BottomSheetDialogFragment {
@BindView(R.id.content_readMore)
TextView contentReadMore;
@@ -52,10 +53,17 @@ public class MoreInfoSheet extends CustomBottomSheetDialogFragment {
this.app = app;
}
@Override
public void onStart() {
super.onStart();
getDialog().getBehavior().setState(BottomSheetBehavior.STATE_EXPANDED);
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.sheet_read_more, container, false);
ButterKnife.bind(this, view);
view.setFitsSystemWindows(true);
return view;
}

View File

@@ -37,7 +37,8 @@ import androidx.annotation.Nullable;
import com.aurora.store.PermissionGroup;
import com.aurora.store.R;
import com.aurora.store.model.App;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import java.util.ArrayList;
import java.util.Collections;
@@ -48,7 +49,7 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
public class PermissionBottomSheet extends CustomBottomSheetDialogFragment {
public class PermissionBottomSheet extends BottomSheetDialogFragment {
@BindView(R.id.permissions_header)
TextView viewHeader;
@@ -73,6 +74,12 @@ public class PermissionBottomSheet extends CustomBottomSheetDialogFragment {
this.context = context;
}
@Override
public void onStart() {
super.onStart();
getDialog().getBehavior().setState(BottomSheetBehavior.STATE_EXPANDED);
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

View File

@@ -38,7 +38,8 @@ import com.aurora.store.model.App;
import com.aurora.store.model.Review;
import com.aurora.store.task.ReviewsHelper;
import com.aurora.store.utility.Log;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import java.util.List;
@@ -49,7 +50,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class ReviewsBottomSheet extends CustomBottomSheetDialogFragment {
public class ReviewsBottomSheet extends BottomSheetDialogFragment {
@BindView(R.id.reviews_recycler)
RecyclerView mRecyclerView;
@@ -63,6 +64,12 @@ public class ReviewsBottomSheet extends CustomBottomSheetDialogFragment {
this.app = app;
}
@Override
public void onStart() {
super.onStart();
getDialog().getBehavior().setState(BottomSheetBehavior.STATE_EXPANDED);
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.sheet_reviews, container, false);

View File

@@ -36,9 +36,9 @@ import com.aurora.store.model.Review;
import com.aurora.store.model.ReviewBuilder;
import com.aurora.store.task.BaseTask;
import com.aurora.store.utility.Log;
import com.aurora.store.view.CustomBottomSheetDialogFragment;
import com.dragons.aurora.playstoreapiv2.GooglePlayAPI;
import com.dragons.aurora.playstoreapiv2.ReviewResponse;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.textfield.TextInputEditText;
import java.io.IOException;
@@ -50,7 +50,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;
public class UserReviewBottomSheet extends CustomBottomSheetDialogFragment {
public class UserReviewBottomSheet extends BottomSheetDialogFragment {
@BindView(R.id.review_title)
TextInputEditText txtTitle;

View File

@@ -27,6 +27,7 @@ import com.aurora.store.model.AppBuilder;
import com.aurora.store.model.Review;
import com.aurora.store.model.ReviewBuilder;
import com.aurora.store.utility.Accountant;
import com.aurora.store.utility.PackageUtil;
import com.dragons.aurora.playstoreapiv2.DetailsResponse;
import com.dragons.aurora.playstoreapiv2.ReviewResponse;
@@ -51,6 +52,8 @@ public class DetailsApp extends BaseTask {
app.setUserReview(review);
}
}
if (PackageUtil.isInstalled(context, app))
app.setInstalled(true);
return app;
}
}

View File

@@ -45,5 +45,4 @@ public class ColorUtil {
final double darkness = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255;
return darkness < 0.4;
}
}

View File

@@ -20,6 +20,7 @@
package com.aurora.store.utility;
import android.content.Context;
import android.content.Intent;
import androidx.appcompat.app.AppCompatActivity;
@@ -61,6 +62,17 @@ public class ThemeUtil {
}
}
public static boolean isLightTheme(Context context) {
String theme = Util.getTheme(context);
switch (theme) {
case "dark":
case "black":
return false;
default:
return true;
}
}
private static final class OverridePendingTransition {
static void invoke(AppCompatActivity activity) {
activity.overridePendingTransition(0, 0);

View File

@@ -32,24 +32,16 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.RotateAnimation;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.MenuRes;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.view.ViewCompat;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.aurora.store.R;
import com.aurora.store.model.MenuEntry;
import java.util.ArrayList;
import java.util.List;
@@ -137,22 +129,6 @@ public class ViewUtil {
setText(v, viewId, v.getResources().getString(stringId, text));
}
public static void hideBottomNav(View view, boolean withAnimation) {
ViewCompat.animate(view)
.translationY(view.getHeight())
.setInterpolator(new LinearOutSlowInInterpolator())
.setDuration(withAnimation ? ANIMATION_DURATION_SHORT : 0)
.start();
}
public static void showBottomNav(View view, boolean withAnimation) {
ViewCompat.animate(view)
.translationY(0)
.setInterpolator(new LinearOutSlowInInterpolator())
.setDuration(withAnimation ? ANIMATION_DURATION_SHORT : 0)
.start();
}
public static void showWithAnimation(View view) {
final int mShortAnimationDuration = view.getResources().getInteger(
android.R.integer.config_shortAnimTime);
@@ -229,16 +205,4 @@ public class ViewUtil {
else
setVisibility(view, visibility);
}
public static List<MenuEntry> parseMenu(Context context, @MenuRes int menuRes) {
List<MenuEntry> menuEntryList = new ArrayList<>();
PopupMenu p = new PopupMenu(context, null);
Menu menu = p.getMenu();
new MenuInflater(context).inflate(menuRes, menu);
for (int i = 0; i < menu.size(); i++) {
MenuItem item = menu.getItem(i);
menuEntryList.add(new MenuEntry(item.getTitle().toString(), item.getIcon(), item.getItemId()));
}
return menuEntryList;
}
}

View File

@@ -1,59 +0,0 @@
/*
* Aurora Store
* Copyright (C) 2019, Rahul Kumar Patel <whyorean@gmail.com>
*
* Aurora Store is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Aurora Store is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
*
*
*/
package com.aurora.store.view;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import com.aurora.store.R;
import com.aurora.store.utility.Util;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
public class CustomBottomSheetDialogFragment extends BottomSheetDialogFragment {
@Override
public int getTheme() {
return getSelectedTheme(getContext());
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return super.onCreateDialog(savedInstanceState);
}
private int getSelectedTheme(Context context) {
String theme = Util.getTheme(context);
switch (theme) {
case "light":
return R.style.BottomSheetDialogTheme;
case "dark":
return R.style.BottomSheetDialogTheme_Dark;
case "black":
return R.style.BottomSheetDialogTheme_Black;
default:
return R.style.BottomSheetDialogTheme;
}
}
}

View File

@@ -21,5 +21,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?android:colorAccent" android:state_selected="true" />
<item android:color="?android:textColorSecondary" />
<item android:color="?android:colorControlNormal" />
</selector>

View File

@@ -22,7 +22,7 @@
android:shape="rectangle">
<size
android:width="100dp"
android:height="100dp" />
<corners android:radius="8dp" />
android:height="20dp" />
<corners android:radius="18dp" />
<solid android:color="?android:attr/colorBackground" />
</shape>

View File

@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z" />
<path
android:fillColor="#FF000000"
android:pathData="M6.75,2.5A4.25,4.25 0,0 1,11 6.75L11,11L6.75,11a4.25,4.25 0,1 1,0 -8.5zM9,9L9,6.75A2.25,2.25 0,1 0,6.75 9L9,9zM6.75,13L11,13v4.25A4.25,4.25 0,1 1,6.75 13zM6.75,15A2.25,2.25 0,1 0,9 17.25L9,15L6.75,15zM17.25,2.5a4.25,4.25 0,1 1,0 8.5L13,11L13,6.75a4.25,4.25 0,0 1,4.25 -4.25zM17.25,9A2.25,2.25 0,1 0,15 6.75L15,9h2.25zM13,13h4.25A4.25,4.25 0,1 1,13 17.25L13,13zM15,15v2.25A2.25,2.25 0,1 0,17.25 15L15,15z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorControlNormal"
android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8 -8,-8z"/>
</vector>

View File

@@ -24,10 +24,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillAlpha="0.1"
android:fillColor="?android:attr/colorForeground"
android:pathData="M14.17,11H13V5h-2v6H9.83L12,13.17z" />
<path
android:fillColor="?android:attr/colorForeground"
android:fillColor="?colorControlNormal"
android:pathData="M19,9h-4L15,3L9,3v6L5,9l7,7 7,-7zM11,11L11,5h2v6h1.17L12,13.17 9.83,11L11,11zM5,18h14v2L5,20z" />
</vector>

View File

@@ -3,7 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3zM17,18h-2v-6L9,12v6L7,18v-7.81l5,-4.5 5,4.5L17,18z" />
<path
android:fillColor="#FF000000"
android:pathData="M19,19L19,9.799l-7,-5.522 -7,5.522L5,19h14zM21,20a1,1 0,0 1,-1 1L4,21a1,1 0,0 1,-1 -1L3,9.314a1,1 0,0 1,0.38 -0.785l8,-6.311a1,1 0,0 1,1.24 0l8,6.31a1,1 0,0 1,0.38 0.786L21,20zM7,12h2a3,3 0,0 0,6 0h2a5,5 0,0 1,-10 0z"/>
</vector>

View File

@@ -1,29 +1,9 @@
<!--
~ Aurora Store
~ Copyright (C) 2019, Rahul Kumar Patel <whyorean@gmail.com>
~
~ Aurora Store is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 2 of the License, or
~ (at your option) any later version.
~
~ Aurora Store is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with Aurora Store. If not, see <http://www.gnu.org/licenses/>.
~
~
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?android:attr/colorForeground"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
</vector>
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M18.031,16.617l4.283,4.282 -1.415,1.415 -4.282,-4.283A8.96,8.96 0,0 1,11 20c-4.968,0 -9,-4.032 -9,-9s4.032,-9 9,-9 9,4.032 9,9a8.96,8.96 0,0 1,-1.969 5.617zM16.025,15.875A6.977,6.977 0,0 0,18 11c0,-3.868 -3.133,-7 -7,-7 -3.868,0 -7,3.132 -7,7 0,3.867 3.132,7 7,7a6.977,6.977 0,0 0,4.875 -1.975l0.15,-0.15z"/>
</vector>

View File

@@ -24,10 +24,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillAlpha="0.1"
android:fillColor="?android:attr/colorForeground"
android:pathData="M19.28,8.6l-0.7,-1.21 -1.27,0.51 -1.06,0.43 -0.91,-0.7c-0.39,-0.3 -0.8,-0.54 -1.23,-0.71l-1.06,-0.43 -0.16,-1.13L12.7,4h-1.4l-0.19,1.35 -0.16,1.13 -1.06,0.44c-0.41,0.17 -0.82,0.41 -1.25,0.73l-0.9,0.68 -1.05,-0.42 -1.27,-0.52 -0.7,1.21 1.08,0.84 0.89,0.7 -0.14,1.13c-0.03,0.3 -0.05,0.53 -0.05,0.73s0.02,0.43 0.05,0.73l0.14,1.13 -0.89,0.7 -1.08,0.84 0.7,1.21 1.27,-0.51 1.06,-0.43 0.91,0.7c0.39,0.3 0.8,0.54 1.23,0.71l1.06,0.43 0.16,1.13 0.19,1.36h1.39l0.19,-1.35 0.16,-1.13 1.06,-0.43c0.41,-0.17 0.82,-0.41 1.25,-0.73l0.9,-0.68 1.04,0.42 1.27,0.51 0.7,-1.21 -1.08,-0.84 -0.89,-0.7 0.14,-1.13c0.04,-0.31 0.05,-0.52 0.05,-0.73 0,-0.21 -0.02,-0.43 -0.05,-0.73l-0.14,-1.13 0.89,-0.7 1.1,-0.84zM12,16c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4z" />
<path
android:fillColor="?android:attr/colorForeground"
android:fillColor="?colorControlNormal"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
</vector>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Open Sans&amp;weight=600"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

View File

@@ -41,6 +41,7 @@
android:layout_gravity="bottom"
app:backgroundTint="?android:colorBackground"
app:elevation="6dp"
app:itemTextAppearanceActive="@style/TextAppearance.Aurora.BottomNav.Active"
app:itemTextAppearanceInactive="@style/TextAppearance.Aurora.BottomNav.Inactive"
app:menu="@menu/navigation" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@@ -36,7 +36,6 @@
android:layout_height="wrap_content"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingTop="@dimen/margin_small"
android:paddingBottom="@dimen/bottom_nav_padding"
android:scrollbars="none">
@@ -47,7 +46,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_top_categories"
@@ -91,7 +91,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/top_apps_name"
@@ -135,7 +136,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/top_apps_games"
@@ -179,7 +181,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_small">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/top_apps_family"

View File

@@ -22,8 +22,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="@dimen/margin_normal"
android:layout_marginEnd="@dimen/margin_normal"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_weight="2"
android:gravity="center"
android:orientation="horizontal">
@@ -33,7 +33,8 @@
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_margin="@dimen/margin_xxsmall"
android:layout_marginStart="@dimen/margin_xxsmall"
android:layout_marginEnd="@dimen/margin_xxsmall"
android:layout_weight="1"
android:maxLines="1"
android:paddingStart="@dimen/margin_large"
@@ -49,7 +50,8 @@
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_margin="@dimen/margin_xxsmall"
android:layout_marginStart="@dimen/margin_xxsmall"
android:layout_marginEnd="@dimen/margin_xxsmall"
android:layout_weight="1"
android:maxLines="1"
android:paddingStart="@dimen/margin_large"

View File

@@ -54,14 +54,14 @@
android:id="@+id/app_desc_short"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_normal"
android:layout_marginBottom="@dimen/margin_normal"
android:background="@color/colorScrim"
android:layout_margin="@dimen/margin_medium"
android:background="@drawable/generic_bg"
android:gravity="center"
android:minHeight="56dp"
android:padding="@dimen/margin_small"
android:textAlignment="center"
android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="16sp"
android:visibility="gone"
app:autoSizeMaxTextSize="16sp"
@@ -101,17 +101,17 @@
android:id="@+id/app_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_margin="@dimen/margin_medium"
android:visibility="gone">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="200dp"
android:scaleType="centerCrop"
android:src="?android:attr/colorPrimaryDark" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/video_play"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
@@ -139,7 +139,7 @@
android:id="@+id/developer_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_margin="@dimen/margin_medium"
android:background="@drawable/generic_padded_bg"
android:gravity="start"
android:orientation="vertical"
@@ -149,7 +149,5 @@
<include layout="@layout/include_details_bottom" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View File

@@ -23,7 +23,7 @@
android:id="@+id/beta_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:layout_margin="@dimen/margin_medium"
android:background="@drawable/generic_padded_bg"
android:orientation="vertical"
android:visibility="gone">

View File

@@ -24,7 +24,7 @@
android:id="@+id/changes_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_margin="@dimen/margin_medium"
android:animateLayoutChanges="true"
android:background="@drawable/generic_padded_bg"
android:minHeight="32dp"
@@ -32,16 +32,15 @@
android:visibility="invisible">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginBottom="@dimen/margin_xsmall"
android:text="@string/details_new_changes"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:textStyle="bold" />
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/changes_upper"
android:id="@+id/txt_changelog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoLink="web|email"

View File

@@ -23,11 +23,11 @@
android:id="@+id/exodus_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:layout_margin="@dimen/margin_medium"
android:background="@drawable/generic_padded_bg"
android:visibility="gone">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/privacy_ico"
android:layout_width="@dimen/icon_size_med"
android:layout_height="@dimen/icon_size_med"

View File

@@ -21,70 +21,62 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/margin_small">
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:layout_width="@dimen/icon_size_big"
android:layout_height="@dimen/icon_size_big"
android:layout_centerHorizontal="true" />
android:layout_width="@dimen/icon_size_normal"
android:layout_height="@dimen/icon_size_normal"
android:layout_margin="@dimen/margin_normal" />
<RelativeLayout
android:id="@+id/app_txt"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/icon"
android:layout_alignTop="@id/icon"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_medium"
android:paddingStart="@dimen/margin_small"
android:paddingEnd="@dimen/margin_small">
android:layout_marginStart="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_toEndOf="@id/icon">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/displayName"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:ellipsize="none"
android:fontFamily="@font/open_sans_semibold"
android:maxWidth="320dp"
android:maxLines="2"
android:requiresFadingEdge="horizontal"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Aurora.Title"
android:textSize="20sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/packageName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/displayName"
android:layout_centerHorizontal="true"
android:singleLine="true"
android:textAlignment="viewStart"
android:textIsSelectable="true"
android:textSize="12sp" />
android:textAppearance="@style/TextAppearance.Aurora.Title"
android:textSize="22sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/devName"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/packageName"
android:layout_centerHorizontal="true"
android:layout_below="@id/displayName"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:attr/colorAccent"
android:textSize="16sp" />
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/packageName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/devName"
android:singleLine="true"
android:textIsSelectable="true"
android:textSize="12sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/versionString"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/devName"
android:layout_centerHorizontal="true"
android:layout_below="@id/packageName"
android:ellipsize="marquee"
android:singleLine="true"
android:textAlignment="viewStart"
@@ -95,7 +87,7 @@
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/app_txt"
android:layout_below="@+id/icon"
android:clipToPadding="false"
android:paddingStart="@dimen/margin_normal"
android:paddingEnd="@dimen/margin_normal"
@@ -106,13 +98,13 @@
android:layout_height="match_parent">
<com.google.android.material.chip.Chip
android:id="@+id/txt_updated"
android:id="@+id/price"
style="@style/Widget.MaterialComponents.Chip.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.google.android.material.chip.Chip
android:id="@+id/price"
android:id="@+id/txt_updated"
style="@style/Widget.MaterialComponents.Chip.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Store
~ Copyright (C) 2019, Rahul Kumar Patel <whyorean@gmail.com>
~
@@ -19,27 +18,34 @@
~
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/more_card"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/more_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:transitionGroup="true"
android:layout_marginStart="@dimen/margin_medium"
android:layout_marginEnd="@dimen/margin_medium"
android:layout_marginBottom="@dimen/margin_normal"
android:visibility="gone">
<com.google.android.material.chip.Chip
<TextView
android:id="@+id/showLessMoreTxt"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:layout_toStartOf="@id/img_more"
android:background="?selectableItemBackground"
android:text="@string/details_more"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle"
android:textSize="18sp" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/img_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/details_more"
android:textSize="14sp"
app:chipBackgroundColor="?android:attr/colorBackground"
app:chipIcon="@drawable/ic_read_more"
app:chipStrokeColor="?android:attr/colorControlNormal"
app:chipStrokeWidth=".75dp"
app:iconStartPadding="4dp" />
</LinearLayout>
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/margin_small"
android:src="@drawable/ic_arrow" />
</RelativeLayout>

View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Store
~ Copyright (C) 2019, Rahul Kumar Patel <whyorean@gmail.com>
~
@@ -26,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical"
android:visibility="invisible">
android:visibility="gone">
<com.google.android.material.chip.Chip
style="@style/Widget.MaterialComponents.Chip.Action"
@@ -174,21 +173,38 @@
android:id="@+id/reviews_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginTop="@dimen/margin_xsmall"
android:layout_marginStart="@dimen/margin_xsmall"
android:layout_marginEnd="@dimen/margin_small"
android:orientation="vertical" />
<com.google.android.material.chip.Chip
android:id="@+id/txt_readAll"
style="@style/Widget.MaterialComponents.Chip.Action"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/more_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/details_appReviewsAll"
android:textSize="14sp"
app:chipBackgroundColor="?android:attr/colorBackground"
app:chipIcon="@drawable/ic_read_more"
app:chipStrokeColor="?android:attr/colorControlNormal"
app:chipStrokeWidth=".75dp"
app:iconStartPadding="4dp" />
android:layout_marginStart="@dimen/margin_medium"
android:layout_marginEnd="@dimen/margin_medium">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:layout_toStartOf="@id/img_review"
android:background="?selectableItemBackground"
android:text="@string/details_appReviewsAll"
android:textAppearance="@style/TextAppearance.Aurora.SubTitle"
android:textSize="18sp" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/img_review"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/margin_small"
android:src="@drawable/ic_arrow" />
</RelativeLayout>
</LinearLayout>

View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="132dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_xsmall"
android:layout_width="@dimen/icon_size_big"
android:layout_height="@dimen/icon_size_big"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:background="@drawable/category_bg">
<ImageView
@@ -20,9 +21,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/cat_icon"
android:layout_marginTop="@dimen/margin_small"
android:ellipsize="end"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_xsmall"
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.Aurora.DialogSubTitle"

View File

@@ -21,17 +21,16 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_marginEnd="@dimen/margin_xsmall"
android:layout_width="120dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
app:rippleColor="@color/colorScrim">
<ImageView
android:id="@+id/app_icon"
android:layout_width="@dimen/icon_size_big"
android:layout_height="@dimen/icon_size_big"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_xxsmall"
android:contentDescription="@string/content_description_icon" />
@@ -42,25 +41,23 @@
android:layout_below="@id/app_icon"
android:layout_alignStart="@id/app_icon"
android:layout_alignEnd="@id/app_icon"
android:layout_marginTop="@dimen/margin_xsmall"
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:textSize="13sp"
tools:text="Aurora Store" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_size"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/app_name"
android:layout_alignStart="@id/app_icon"
android:layout_alignEnd="@id/app_icon"
android:layout_marginBottom="@dimen/margin_xxsmall"
android:ellipsize="end"
android:maxLines="1"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
android:textSize="12sp"
tools:text="6 MB" />
@@ -68,8 +65,11 @@
android:id="@+id/txt_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignBaseline="@id/app_size"
android:layout_toEndOf="@id/app_size"
android:drawableEnd="@drawable/ic_installed"
android:scaleX=".75"
android:scaleY=".75"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="normal"
android:visibility="visible" />

View File

@@ -45,9 +45,7 @@
android:fadingEdgeLength="16dp"
android:requiresFadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Aurora.Toolbar.Title"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp" />
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/txt_indicator"
@@ -58,6 +56,7 @@
android:drawablePadding="@dimen/margin_small"
android:text="@string/action_installed"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="12sp"
android:textStyle="normal"
android:visibility="gone" />
</RelativeLayout>

View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Aurora Store
~ Copyright (C) 2019, Rahul Kumar Patel <whyorean@gmail.com>
~
@@ -48,9 +47,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
android:textSize="17sp"
android:textStyle="bold" />
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_version"

View File

@@ -22,7 +22,7 @@
android:id="@+id/screenshot_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_marginStart="@dimen/margin_small"
android:clickable="true"
android:focusable="true"
android:scaleType="fitXY" />
android:scaleType="centerCrop" />

View File

@@ -54,9 +54,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
android:textSize="17sp"
android:textStyle="bold" />
android:textAppearance="@style/TextAppearance.Aurora.SubTitle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/app_version"

View File

@@ -23,7 +23,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="320dp"
android:orientation="vertical"
tools:targetApi="o">

View File

@@ -140,11 +140,12 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/filter_apply"
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_gravity="end"
android:layout_margin="@dimen/margin_small"
android:text="@string/action_filter_apply"
android:textAppearance="@style/TextAppearance.Aurora.Button"
app:backgroundTint="@color/colorAccent" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>

View File

@@ -23,7 +23,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="320dp"
android:orientation="vertical"
tools:targetApi="o">

View File

@@ -23,7 +23,6 @@
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="320dp"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView

View File

@@ -24,7 +24,6 @@
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="320dp"
android:orientation="vertical"
tools:targetApi="o">

View File

@@ -107,6 +107,5 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/margin_normal"
android:text="@android:string/ok" />
</LinearLayout>
</LinearLayout>

View File

@@ -24,11 +24,11 @@
style="@style/Widget.AppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp">
app:elevation="1dp">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content"
app:layout_scrollFlags="enterAlways|exitUntilCollapsed" />
</com.google.android.material.appbar.AppBarLayout>

View File

@@ -12,8 +12,8 @@
<item name="android:navigationBarColor">@color/colorBlack</item>
<item name="android:colorBackground">@color/colorPrimary</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="colorControlNormal">@color/colorGreyDark</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView</item>
<item name="android:colorBackgroundFloating">@color/colorRed</item>
</style>
<style name="AppTheme.Dark" parent="Theme.MaterialComponents.NoActionBar">
@@ -26,6 +26,7 @@
<item name="android:windowBackground">@color/colorDarkWindowBackground</item>
<item name="android:navigationBarColor">@color/colorDarkPrimary</item>
<item name="android:colorBackground">@color/colorDarkBackground</item>
<item name="colorSurface">@color/colorDarkBackground</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Dark</item>
</style>
@@ -40,6 +41,7 @@
<item name="android:windowBackground">@color/colorBlack</item>
<item name="android:navigationBarColor">@color/colorBlack</item>
<item name="android:colorBackground">@color/colorBlack</item>
<item name="colorSurface">@color/colorBlack</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Black</item>
</style>

View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimaryDark">@color/colorWhite</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="toolbarStyle">@style/Widget.Toolbar</item>
<item name="android:strokeColor">@color/colorGreyLight</item>
@@ -11,6 +12,7 @@
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
<item name="android:windowLightNavigationBar">true</item>
<item name="android:colorBackground">@color/colorPrimary</item>
<item name="colorControlNormal">@color/colorGreyDark</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView</item>
</style>
@@ -26,6 +28,7 @@
<item name="android:navigationBarColor">@color/colorDarkPrimary</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="android:colorBackground">@color/colorDarkBackground</item>
<item name="colorSurface">@color/colorDarkBackground</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Dark</item>
</style>
@@ -41,6 +44,7 @@
<item name="android:navigationBarColor">@color/colorBlack</item>
<item name="android:windowLightNavigationBar">false</item>
<item name="android:colorBackground">@color/colorBlack</item>
<item name="colorSurface">@color/colorBlack</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Black</item>
</style>

View File

@@ -34,6 +34,7 @@
<dimen name="bottom_nav_padding">64dp</dimen>
<dimen name="icon_size">64dp</dimen>
<dimen name="icon_size_normal">80dp</dimen>
<dimen name="icon_size_big">100dp</dimen>
<dimen name="icon_size_small">56dp</dimen>
<dimen name="icon_size_med">48dp</dimen>

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="com_google_android_gms_fonts_certs">
<item>@array/com_google_android_gms_fonts_certs_dev</item>
<item>@array/com_google_android_gms_fonts_certs_prod</item>
</array>
<string-array name="com_google_android_gms_fonts_certs_dev">
<item>
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
</item>
</string-array>
<string-array name="com_google_android_gms_fonts_certs_prod">
<item>
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
</item>
</string-array>
</resources>

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<array name="preloaded_fonts" translatable="false">
<item>@font/open_sans_semibold</item>
</array>
</resources>

View File

@@ -40,6 +40,7 @@
<item name="android:strokeColor">@color/colorGreyLight</item>
<item name="android:windowBackground">@color/colorDarkWindowBackground</item>
<item name="android:colorBackground">@color/colorDarkBackground</item>
<item name="colorSurface">@color/colorDarkBackground</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Dark</item>
</style>
@@ -52,6 +53,7 @@
<item name="android:strokeColor">@color/colorGreyLight</item>
<item name="android:windowBackground">@color/colorBlack</item>
<item name="android:colorBackground">@color/colorBlack</item>
<item name="colorSurface">@color/colorBlack</item>
<item name="chipStyle">@style/Widget.Aurora.FilterChip</item>
<item name="materialCardViewStyle">@style/Aurora.MaterialComponents.CardView.Black</item>
</style>

View File

@@ -21,16 +21,14 @@
<resources>
<style name="TextAppearance.Aurora.Title" parent="TextAppearance.AppCompat.Medium">
<item name="android:ellipsize">end</item>
<item name="android:fontFamily">@font/open_sans_semibold</item>
<item name="android:maxLines">1</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:maxLines">1</item>
<item name="android:ellipsize">end</item>
<item name="android:letterSpacing">0.025</item>
</style>
<style name="TextAppearance.Aurora.Header" parent="@style/TextAppearance.Aurora.Title">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
</style>
@@ -40,9 +38,18 @@
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.Aurora.BottomNav.Active" parent="TextAppearance.Aurora.Title">
<item name="android:letterSpacing">0.015</item>
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.Aurora.BottomNav.Inactive" parent="TextAppearance.Aurora.Title">
<item name="android:letterSpacing">0.015</item>
<item name="android:textSize">12sp</item>
</style>
<style name="TextAppearance.Aurora.Button" parent="TextAppearance.Aurora.Title">
<item name="android:letterSpacing">0.075</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">16sp</item>
</style>
@@ -67,13 +74,13 @@
<item name="android:textStyle">normal</item>
</style>
<style name="TextAppearance.Aurora.DialogTitle" parent="@style/TextAppearance.AppCompat.Title">
<style name="TextAppearance.Aurora.DialogTitle" parent="@style/TextAppearance.Aurora.Title">
<item name="android:textSize">22sp</item>
<item name="android:letterSpacing">0.025</item>
<item name="android:gravity">center</item>
</style>
<style name="TextAppearance.Aurora.DialogSubTitle" parent="@style/TextAppearance.Aurora.DialogTitle">
<style name="TextAppearance.Aurora.DialogSubTitle" parent="@style/TextAppearance.Aurora.SubTitle">
<item name="android:textSize">14sp</item>
</style>