diff --git a/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java b/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java index 23eb6ab8e..3a6eeeac8 100644 --- a/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java +++ b/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java @@ -23,20 +23,20 @@ package com.dragons.aurora.activities; import android.content.Intent; import android.os.Bundle; +import android.view.View; import com.dragons.aurora.R; import com.dragons.aurora.fragment.AboutFragment; -import com.dragons.aurora.view.AdaptiveToolbar; public class AboutActivity extends AuroraActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.helper_activity); - AdaptiveToolbar dadtb = findViewById(R.id.d_adtb); - dadtb.getAction_icon().setOnClickListener((v -> this.onBackPressed())); - + setContentView(R.layout.helper_activity_alt); + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); + getWindow().setStatusBarColor(getResources().getColor(R.color.semi_transparent)); getSupportFragmentManager() .beginTransaction() .replace(R.id.content_frame, new AboutFragment()) diff --git a/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java b/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java index 85baab040..7c8544eaf 100644 --- a/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java +++ b/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java @@ -21,26 +21,28 @@ package com.dragons.aurora.fragment; -import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.net.Uri; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; -import com.dragons.aurora.CircleTransform; import com.dragons.aurora.R; -import com.squareup.picasso.Picasso; +import com.dragons.aurora.view.LinkCard; public class AboutFragment extends UtilFragment { - private View v; + private final int linkIcons[] = { + R.drawable.ic_gitlab, + R.drawable.ic_xda, + R.drawable.ic_telegram + }; + private View view; @Override public void onCreate(Bundle savedInstanceState) { @@ -50,65 +52,41 @@ public class AboutFragment extends UtilFragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - if (v != null) { - if ((ViewGroup) v.getParent() != null) - ((ViewGroup) v.getParent()).removeView(v); - return v; + if (view != null) { + if ((ViewGroup) view.getParent() != null) + ((ViewGroup) view.getParent()).removeView(view); + return view; } - v = inflater.inflate(R.layout.app_abt_inc, container, false); + view = inflater.inflate(R.layout.app_abt_inc, container, false); - getActivity().setTitle(R.string.action_about); + ((TextView) view.findViewById(R.id.aurora_title)).setText(R.string.action_about); + ((ImageView) view.findViewById(R.id.toolbar_back)).setOnClickListener(click -> getActivity().onBackPressed()); drawVersion(); - drawActions(); - drawDevCard(R.string.dev1_imgURL, (ImageView) v.findViewById(R.id.dev1_avatar)); - drawDevCard(R.string.dev2_imgURL, (ImageView) v.findViewById(R.id.dev2_avatar)); - drawList(getResources().getStringArray(R.array.contributors), ((TextView) v.findViewById(R.id.contributors))); - drawList(getResources().getStringArray(R.array.opensource), ((TextView) v.findViewById(R.id.opensource))); - - return v; + drawLinks(); + return view; } private void drawVersion() { try { PackageInfo packageInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0); - ((TextView) v.findViewById(R.id.app_version)).setText(packageInfo.versionName + "." + packageInfo.versionCode); + ((TextView) view.findViewById(R.id.app_version)).setText(packageInfo.versionName + "." + packageInfo.versionCode); } catch (PackageManager.NameNotFoundException e) { e.printStackTrace(); } } - private void drawActions() { - final Intent browserIntent = new Intent(Intent.ACTION_VIEW); - ((TextView) v.findViewById(R.id.github)).setOnClickListener(v -> { - browserIntent.setData(Uri.parse(getResources().getString(R.string.linkGit))); - startActivity(browserIntent); - }); - ((TextView) v.findViewById(R.id.xda)).setOnClickListener(v -> { - browserIntent.setData(Uri.parse(getResources().getString(R.string.linkXDA))); - startActivity(browserIntent); - }); - ((TextView) v.findViewById(R.id.telegram)).setOnClickListener(v -> { - browserIntent.setData(Uri.parse(getResources().getString(R.string.linkTelegram))); - startActivity(browserIntent); - }); - } - - private void drawDevCard(int URL, ImageView imageView) { - Picasso.with(this.getActivity()) - .load(getResources().getString(URL)) - .placeholder(ContextCompat.getDrawable(getContext(),R.drawable.ic_user_placeholder)) - .transform(new CircleTransform()) - .into(imageView); - } - - private void drawList(String[] List, TextView tv) { - StringBuilder builder = new StringBuilder(); - for (String s : List) { - builder.append("◉ "); - builder.append(s); - builder.append("\n"); - } - (tv).setText(builder.toString().trim()); + public void drawLinks() { + LinearLayout linkContainer = view.findViewById(R.id.linkContainer); + String[] linkURLS = getResources().getStringArray(R.array.linkURLS); + String[] linkTitles = getResources().getStringArray(R.array.linkTitles); + String[] linkSummary = getResources().getStringArray(R.array.linkSummary); + int index = 0; + for (String URL : linkURLS) + linkContainer.addView(new LinkCard(getContext(), + URL, + linkTitles[index], + linkSummary[index], + linkIcons[index++])); } } \ No newline at end of file diff --git a/app/src/main/java/com/dragons/aurora/view/LinkCard.java b/app/src/main/java/com/dragons/aurora/view/LinkCard.java new file mode 100644 index 000000000..d00f80d14 --- /dev/null +++ b/app/src/main/java/com/dragons/aurora/view/LinkCard.java @@ -0,0 +1,79 @@ +/* + * Aurora Store + * Copyright (C) 2018 Rahul Kumar Patel + * + * Yalp Store + * Copyright (C) 2018 Sergey Yeriomin + * + * Aurora Store (a fork of Yalp 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 . + */ + +package com.dragons.aurora.view; + +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.support.v7.widget.CardView; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.dragons.aurora.R; + +public class LinkCard extends RelativeLayout { + + Context context; + CardView link_card; + ImageView card_icon; + TextView card_title; + TextView card_summary; + private String title; + private String summary; + private String linkURL; + private int cardIconID; + + public LinkCard(Context context, String linkURL, String title, String summary, int cardIconID) { + super(context); + this.context = context; + this.linkURL = linkURL; + this.title = title; + this.summary = summary; + this.cardIconID = cardIconID; + init(context); + } + + public LinkCard(Context context, AttributeSet attrs) { + super(context, attrs); + init(context); + } + + private void init(Context context) { + View view = inflate(context, R.layout.link_card, this); + link_card = view.findViewById(R.id.link_card); + card_icon = view.findViewById(R.id.card_icon); + card_title = view.findViewById(R.id.card_title); + card_summary = view.findViewById(R.id.card_summary); + card_title.setText(title); + card_summary.setText(summary); + card_icon.setImageResource(cardIconID); + + link_card.setOnClickListener(click -> { + final Intent browserIntent = new Intent(Intent.ACTION_VIEW); + browserIntent.setData(Uri.parse(linkURL)); + context.startActivity(browserIntent); + }); + } +} diff --git a/app/src/main/res/drawable/ic_fdroid.xml b/app/src/main/res/drawable/ic_fdroid.xml new file mode 100644 index 000000000..c52fc5f2e --- /dev/null +++ b/app/src/main/res/drawable/ic_fdroid.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml deleted file mode 100644 index 4ccb20e49..000000000 --- a/app/src/main/res/drawable/ic_github.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_gitlab.xml b/app/src/main/res/drawable/ic_gitlab.xml new file mode 100644 index 000000000..f7e27b9e5 --- /dev/null +++ b/app/src/main/res/drawable/ic_gitlab.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml index e526dac2c..71d335c5d 100644 --- a/app/src/main/res/drawable/ic_telegram.xml +++ b/app/src/main/res/drawable/ic_telegram.xml @@ -20,11 +20,49 @@ --> + xmlns:aapt="http://schemas.android.com/aapt" + android:width="24dp" + android:height="24dp" + android:viewportHeight="240.0" + android:viewportWidth="240.0"> + + + + + + + + + android:fillColor="#c8daea" + android:pathData="m98,175c-3.89,0 -3.23,-1.47 -4.57,-5.17L82,132.21 170,80" /> + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_xda.xml b/app/src/main/res/drawable/ic_xda.xml index 49268cab4..8b4df5de7 100644 --- a/app/src/main/res/drawable/ic_xda.xml +++ b/app/src/main/res/drawable/ic_xda.xml @@ -20,11 +20,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + android:fillColor="@color/colorOrange" + android:pathData="M-0.05,16.79L3.19,12.97L-0.05,9.15L1.5,7.86L4.5,11.41L7.5,7.86L9.05,9.15L5.81,12.97L9.05,16.79L7.5,18.07L4.5,14.5L1.5,18.07L-0.05,16.79M24,17A1,1 0,0 1,23 18H20A2,2 0,0 1,18 16V14A2,2 0,0 1,20 12H22V10H18V8H23A1,1 0,0 1,24 9M22,14H20V16H22V14M16,17A1,1 0,0 1,15 18H12A2,2 0,0 1,10 16V10A2,2 0,0 1,12 8H14V5H16V17M14,16V10H12V16H14Z" /> diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml index 30e5e1b7a..cbb01d844 100644 --- a/app/src/main/res/layout-land/activity_login.xml +++ b/app/src/main/res/layout-land/activity_login.xml @@ -1,5 +1,4 @@ - - - - + android:orientation="vertical" + android:weightSum="3"> - + android:layout_height="0dp" + android:layout_weight="1"> + + + + + + + + + + + + + + + + + + + + + + + android:layout_margin="5dp" + android:background="?android:attr/colorBackground" + android:orientation="vertical" + android:padding="5dp"> + app:cardBackgroundColor="?android:attr/panelBackground" + app:cardCornerRadius="10dp" + app:cardElevation="2dp" + app:cardUseCompatPadding="true" + app:contentPadding="5dp"> + android:textSize="18sp" /> + android:textSize="14sp" /> - + android:orientation="vertical" + android:weightSum="4" /> - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/link_card.xml b/app/src/main/res/layout/link_card.xml new file mode 100644 index 000000000..41877066a --- /dev/null +++ b/app/src/main/res/layout/link_card.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 1da37d1f3..78d6579a4 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -1,5 +1,4 @@ - -