Skip to content

Commit

Permalink
Merge pull request #1327 from TeamAmaze/bump-v3.3.0rc1
Browse files Browse the repository at this point in the history 
Bump version and add trancelove as developer
  • Loading branch information
@EmmanuelMess
EmmanuelMess committed Jun 30, 2018
1 parent d2a56c5 commit 642ad39
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
applicationId "com.amaze.filemanager"
minSdkVersion 14
targetSdkVersion 26
versionCode 63
versionCode 65
versionName "3.2.1"
multiDexEnabled true

Expand Down
14 changes: 13 additions & 1 deletion app/src/main/java/com/amaze/filemanager/activities/AboutActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,17 @@ public class AboutActivity extends BasicActivity implements View.OnClickListener
private int mCount=0;
private Snackbar snackbar;
private SharedPreferences mSharedPref;
private View mAuthorsDivider;
private View mAuthorsDivider, mDeveloper1Divider;

private static final String KEY_PREF_STUDIO = "studio";
private static final String URL_AUTHOR_1_G_PLUS = "https://plus.google.com/u/0/110424067388738907251/";
private static final String URL_AUTHOR_1_PAYPAL = "[email protected]";
private static final String URL_AUTHOR_2_G_PLUS = "https://plus.google.com/+VishalNehra/";
private static final String URL_AUTHOR_2_PAYPAL = "https://www.paypal.me/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_DEVELOPER1_BITCOIN = "bitcoin:12SRnoDQvDD8aoCy1SVSn6KSdhQFvRf955?amount=0.0005";
private static final String URL_DEVELOPER2_DONATE = "https://paypal.me/TranceLove";
private static final String URL_REPO_CHANGELOG = "https://github.com/TeamAmaze/AmazeFileManager/commits/master";
private static final String URL_REPO_ISSUES = "https://github.com/TeamAmaze/AmazeFileManager/issues";
private static final String URL_REPO_TRANSLATE = "https://www.transifex.com/amaze/amaze-file-manager-1/";
Expand Down Expand Up @@ -84,6 +86,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
mTitleTextView = findViewById(R.id.text_view_title);
ImageView mLicensesIcon = findViewById(R.id.image_view_license);
mAuthorsDivider = findViewById(R.id.view_divider_authors);
mDeveloper1Divider = findViewById(R.id.view_divider_developers_1);

mAppBarLayout.setLayoutParams(calculateHeaderViewParams());

Expand Down Expand Up @@ -150,6 +153,7 @@ private void switchIcons() {
if (getAppTheme().equals(AppTheme.DARK) || getAppTheme().equals(AppTheme.BLACK)) {
// dark theme
mAuthorsDivider.setBackgroundColor(Utils.getColor(this, R.color.divider_dark_card));
mDeveloper1Divider.setBackgroundColor(Utils.getColor(this, R.color.divider_dark_card));
}
}

Expand Down Expand Up @@ -233,6 +237,10 @@ public void onClick(View v) {
openURL(URL_DEVELOPER1_GITHUB);
break;

case R.id.text_view_developer_2_github:
openURL(URL_DEVELOPER2_GITHUB);
break;

case R.id.text_view_developer_1_donate:
try {
openURL(URL_DEVELOPER1_BITCOIN);
Expand All @@ -241,6 +249,10 @@ public void onClick(View v) {
}
break;

case R.id.text_view_developer_2_donate:
openURL(URL_DEVELOPER2_DONATE);
break;

case R.id.relative_layout_translate:
openURL(URL_REPO_TRANSLATE);
break;
Expand Down
61 changes: 61 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 @@ -429,6 +429,67 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>

<!-- divider -->
<View
android:id="@+id/view_divider_developers_1"
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 2 -->
<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">

<TextView
android:id="@+id/text_view_developer_2_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/developer_2"
android:textSize="@dimen/material_generic_title"/>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/text_view_developer_2_title"
android:layout_marginTop="@dimen/material_generic">
<TextView
android:id="@+id/text_view_developer_2_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"/>
<TextView
android:id="@+id/text_view_developer_2_donate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:text="@string/donate"
android:textColor="@color/accent_blue"
android:layout_toRightOf="@+id/text_view_developer_2_github"
android:layout_marginLeft="@dimen/material_generic_medium"
android:textSize="@dimen/material_generic_title"
android:onClick="onClick"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/translators.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@
<string name="vietnamese_translation_summary" translable="false" translatable="false">ngoisaosang</string>
<string name="japanese_translation_summary" translatable="false">Naofumi Fukue</string>
<string name="tamil_translation_summary" translatable="false">Kuralarasi for StarsSoft</string>
<string name="app_version" translatable="false">v3.2.1</string>
<string name="app_version" translatable="false">v3.3.0RC1</string>
<string name="author_1" translatable="false">Arpit Khurana</string>
<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="contributor_1_title" translatable="false">Team MoKee</string>
<string name="contributor_2_title" translatable="false">CookIcons.co</string>
Expand Down

0 comments on commit 642ad39

Please sign in to comment.