kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #108 from RichyHBM/add-developer

Browse source 
Add RichyHBM as a developer
This commit is contained in:
Jakob Nixdorf 2018-01-11 15:32:09 +01:00 committed by GitHub
commit 6e92add768
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 110 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/org/shadowice/flocke/andotp/Activities/AboutActivity.java
View file

@ -49,10 +49,13 @@ public class AboutActivity extends BaseActivity {
private static final String MIT_URI = GITHUB_URI + "/blob/master/LICENSE.txt";
private static final String AUTHOR1_GITHUB = "https://github.com/flocke";
private static final String AUTHOR1_PAYPAL = "https://paypal.me/flocke000";
private static final String AUTHOR1_EXTRA = "https://paypal.me/flocke000";
private static final String AUTHOR2_GITHUB = "https://github.com/0xbb";
private static final String AUTHOR2_APP = AUTHOR2_GITHUB + "/otp-authenticator";
private static final String AUTHOR2_GITHUB = "https://github.com/richyhbm";
private static final String AUTHOR2_EXTRA = "bitcoin:1KyLwnxXR577gYUtwRMSMhkpsJVoK2bTLN";
private static final String AUTHOR_ORIGINAL_GITHUB = "https://github.com/0xbb";
private static final String AUTHOR_ORIGINAL_EXTRA = AUTHOR_ORIGINAL_GITHUB + "/otp-authenticator";
private static final String CONTRIBUTORS_URI = GITHUB_URI + "/blob/master/README.md#contributors";
private static final String TRANSLATORS_URI = GITHUB_URI + "/blob/master/README.md#translators";
@ -62,7 +65,7 @@ public class AboutActivity extends BaseActivity {
static final int[] imageResources = {
R.id.aboutImgVersion, R.id.aboutImgLicense, R.id.aboutImgChangelog, R.id.aboutImgSource,
R.id.aboutImgOpenSource, R.id.aboutImgAuthor1, R.id.aboutImgAuthor2, R.id.aboutImgContributors,
R.id.aboutImgOpenSource, R.id.aboutImgAuthor1, R.id.aboutImgAuthorOriginal, R.id.aboutImgContributors,
R.id.aboutImgTranslators, R.id.aboutImgBugs, R.id.aboutImgTranslate
};
@ -164,7 +167,7 @@ public class AboutActivity extends BaseActivity {
});
TextView author1GitHub = v.findViewById(R.id.about_author1_github);
TextView author1Paypal = v.findViewById(R.id.about_author1_paypal);
TextView author1Paypal = v.findViewById(R.id.about_author1_extra);
author1GitHub.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -174,22 +177,38 @@ public class AboutActivity extends BaseActivity {
author1Paypal.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(AUTHOR1_PAYPAL);
openURI(AUTHOR1_EXTRA);
}
});
TextView author2GitHub = v.findViewById(R.id.about_author2_github);
TextView author2App = v.findViewById(R.id.about_author2_app);
TextView author2Paypal = v.findViewById(R.id.about_author2_extra);
author2GitHub.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(AUTHOR2_GITHUB);
}
});
author2App.setOnClickListener(new View.OnClickListener() {
author2Paypal.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(AUTHOR2_APP);
openURI(AUTHOR2_EXTRA);
}
});
TextView authorOriginalGitHub = v.findViewById(R.id.about_author_original_github);
TextView authorOriginalApp = v.findViewById(R.id.about_author_original_extra);
authorOriginalGitHub.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(AUTHOR_ORIGINAL_GITHUB);
}
});
authorOriginalApp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openURI(AUTHOR_ORIGINAL_EXTRA);
}
});

82
app/src/main/res/layout/content_about.xml
View file

@ -313,7 +313,7 @@
android:text="@string/about_label_github" />
<TextView
android:id="@+id/about_author1_paypal"
android:id="@+id/about_author1_extra"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin_large"
@ -332,7 +332,7 @@
android:background="@color/divider"
android:layout_margin="@dimen/activity_margin" />
<!-- 2nd author -->
<!-- Original author -->
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -367,7 +367,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_label_original_author"/>
android:text="@string/about_label_developer"/>
<LinearLayout
android:orientation="horizontal"
@ -387,7 +387,81 @@
android:text="@string/about_label_github" />
<TextView
android:id="@+id/about_author2_app"
android:id="@+id/about_author2_extra"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin_large"
android:background="?android:attr/selectableItemBackground"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:textColor="?attr/colorPaypal"
android:text="@string/about_label_donate" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider"
android:layout_margin="@dimen/activity_margin" />
<!-- Original author -->
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/activity_margin_small"
android:paddingBottom="@dimen/activity_margin_small"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical" >
<ImageView
android:id="@+id/aboutImgAuthorOriginal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin"
android:layout_marginEnd="@dimen/activity_margin_large"
android:src="@drawable/ic_account_circle_gray" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_name_author_original"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/about_label_original_author"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin"
android:layout_gravity="center_vertical">
<TextView
android:id="@+id/about_author_original_github"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:textColor="?attr/colorGithub"
android:text="@string/about_label_github" />
<TextView
android:id="@+id/about_author_original_extra"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/activity_margin_large"

5
app/src/main/res/values/strings_about.xml
View file

@ -18,13 +18,16 @@
<string name="about_title_authors">Authors</string>
<string name="about_label_main_author">Main author</string>
<string name="about_label_developer">Developer</string>
<string name="about_label_original_author">Author of the original app</string>
<string name="about_label_original_app">Original App</string>
<string name="about_label_website">Website</string>
<string name="about_label_github" translatable="false">Github</string>
<string name="about_label_donate">Donate</string>
<string name="about_name_author1" translatable="false">Jakob Nixdorf</string>
<string name="about_name_author2" translatable="false">Bruno Bierbaumer</string>
<string name="about_name_author_original" translatable="false">Bruno Bierbaumer</string>
<string name="about_name_author2" translatable="false">Richy HBM</string>
<string name="about_label_contributors">Contributors</string>
<string name="about_label_translators">Translators</string>