Skip to content

Commit

Permalink
Merge pull request #4009 from TeamAmaze/add-vishnu-to-metadata
Browse files Browse the repository at this point in the history 
Update metadata
  • Loading branch information
@VishalNehra
VishalNehra committed Jan 28, 2024
2 parents b060155 + 7af47b5 commit 358777c
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 5 deletions.
7 changes: 4 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ We strongly recommend using apk signed by us (either Play Store version or from
### License:

Copyright (C) 2014-2018 Arpit Khurana <arpitkh96@gmail.com>
Copyright (C) 2014-2021 Vishal Nehra <vishalmeham2@gmail.com>
Copyright (C) 2017-2021 Emmanuel Messulam <emmanuelbendavid@gmail.com>
Copyright (C) 2018-2021 Raymond Lai <airwave209gt at gmail.com>
Copyright (C) 2014-2023 Vishal Nehra <vishalmeham2@gmail.com>
Copyright (C) 2017-2023 Emmanuel Messulam <emmanuelbendavid@gmail.com>
Copyright (C) 2018-2023 Raymond Lai <airwave209gt at gmail.com>
Copyright (C) 2019-2023 Vishnu Sanal T <t.v.s10123 at gmail.com>
This file is part of Amaze File Manager.
Amaze File Manager is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
9 changes: 8 additions & 1 deletion app/src/main/java/com/amaze/filemanager/ui/activities/AboutActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@ public class AboutActivity extends ThemedActivity implements View.OnClickListene
private AppBarLayout mAppBarLayout;
private CollapsingToolbarLayout mCollapsingToolbarLayout;
private AppCompatTextView mTitleTextView;
private View mAuthorsDivider, mDeveloper1Divider;
private View mAuthorsDivider, mDeveloper1Divider, mDeveloper2Divider;
private Billing billing;

private static final String URL_AUTHOR1_GITHUB = "https://github.com/arpitkh96";
private static final String URL_AUTHOR2_GITHUB = "https://github.com/VishalNehra";
private static final String URL_DEVELOPER1_GITHUB = "https://github.com/EmmanuelMess";
private static final String URL_DEVELOPER2_GITHUB = "https://github.com/TranceLove";
private static final String URL_DEVELOPER3_GITHUB = "https://github.com/VishnuSanal";
private static final String URL_REPO_CHANGELOG =
"https://github.com/TeamAmaze/AmazeFileManager/commits/master";
private static final String URL_REPO = "https://github.com/TeamAmaze/AmazeFileManager";
Expand Down Expand Up @@ -108,6 +109,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
mTitleTextView = findViewById(R.id.text_view_title);
mAuthorsDivider = findViewById(R.id.view_divider_authors);
mDeveloper1Divider = findViewById(R.id.view_divider_developers_1);
mDeveloper2Divider = findViewById(R.id.view_divider_developers_2);

mAppBarLayout.setLayoutParams(calculateHeaderViewParams());

Expand Down Expand Up @@ -200,6 +202,7 @@ private void switchIcons() {
// dark theme
mAuthorsDivider.setBackgroundColor(Utils.getColor(this, R.color.divider_dark_card));
mDeveloper1Divider.setBackgroundColor(Utils.getColor(this, R.color.divider_dark_card));
mDeveloper2Divider.setBackgroundColor(Utils.getColor(this, R.color.divider_dark_card));
}
}

Expand Down Expand Up @@ -280,6 +283,10 @@ public void onClick(View v) {
openURL(URL_DEVELOPER2_GITHUB, this);
break;

case R.id.text_view_developer_3_github:
openURL(URL_DEVELOPER3_GITHUB, this);
break;

case R.id.relative_layout_translate:
openURL(URL_REPO_TRANSLATE, this);
break;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/amaze/filemanager/utils/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public class Utils {
private static final String DATE_TIME_FORMAT = "%s | %s";
private static final String EMAIL_EMMANUEL = "emmanuelbendavid@gmail.com";
private static final String EMAIL_RAYMOND = "airwave209gt@gmail.com";
private static final String EMAIL_VISHNU = "t.v.s10123@gmail.com";
private static final String EMAIL_VISHAL = "vishalmeham2@gmail.com";
private static final String URL_TELEGRAM = "https://t.me/AmazeFileManager";
private static final String URL_INSTGRAM = "https://www.instagram.com/teamamaze.xyz/";
Expand Down Expand Up @@ -426,7 +427,7 @@ public static void openInstagramURL(Context context) {
public static Intent buildEmailIntent(Context context, String text, String supportMail) {
Intent emailIntent = new Intent(Intent.ACTION_SEND);
String[] aEmailList = {supportMail};
String[] aEmailCCList = {EMAIL_VISHAL, EMAIL_EMMANUEL, EMAIL_RAYMOND};
String[] aEmailCCList = {EMAIL_VISHAL, EMAIL_EMMANUEL, EMAIL_RAYMOND, EMAIL_VISHNU};
emailIntent.putExtra(Intent.EXTRA_EMAIL, aEmailList);
emailIntent.putExtra(Intent.EXTRA_CC, aEmailCCList);
emailIntent.putExtra(
Expand Down
50 changes: 50 additions & 0 deletions app/src/main/res/layout/activity_about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,56 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

<!-- divider -->
<View
android:id="@+id/view_divider_developers_2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider"
android:layout_marginLeft="@dimen/material_generic_large"
android:layout_marginTop="@dimen/material_generic"
android:layout_marginBottom="@dimen/material_generic"
/>

<!-- dev 3 -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/material_generic_list_item"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:layout_marginStart="72dp"
android:layout_marginLeft="72dp">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical">

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_developer_3_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/developer_3"
android:textSize="@dimen/material_generic_title"/>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/text_view_developer_3_title"
android:layout_marginTop="@dimen/material_generic">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_view_developer_3_github"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:text="@string/github"
android:textColor="@color/accent_red"
android:layout_alignParentLeft="true"
android:textSize="@dimen/material_generic_title"
android:onClick="onClick"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/translators.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<string name="author_2" translatable="false">Vishal Nehra</string>
<string name="developer_1" translatable="false">Emmanuel Messulam</string>
<string name="developer_2" translatable="false">Raymond Lai</string>
<string name="developer_3" translatable="false">Vishnu Sanal T</string>

<string name="contributor_1_title" translatable="false">Team MoKee</string>
<string name="contributor_2_title" translatable="false">CookIcons.co</string>
Expand Down

0 comments on commit 358777c

Please sign in to comment.