diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 3a7e7c07..06e94ff4 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -20,8 +20,8 @@
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
index 2073f06a..b8171e28 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
@@ -89,8 +89,9 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
private ImageView profile_image, profile_banner;
private EditText name, link, loc, bio;
- private Button add_banner_btn;
private Dialog loadingCircle, closeDialog;
+ private Button addBannerBtn;
+ private View changeBannerBtn;
private TwitterUser user;
private String profileLink, bannerLink;
@@ -104,7 +105,8 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
View header = findViewById(R.id.editprofile_header);
profile_image = findViewById(R.id.edit_pb);
profile_banner = findViewById(R.id.edit_banner);
- add_banner_btn = findViewById(R.id.edit_add_banner);
+ addBannerBtn = findViewById(R.id.edit_add_banner);
+ changeBannerBtn = findViewById(R.id.edit_change_banner);
name = findViewById(R.id.edit_name);
link = findViewById(R.id.edit_link);
loc = findViewById(R.id.edit_location);
@@ -134,7 +136,7 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
profile_image.setOnClickListener(this);
profile_banner.setOnClickListener(this);
- add_banner_btn.setOnClickListener(this);
+ addBannerBtn.setOnClickListener(this);
cancelButton.setOnClickListener(this);
loadingCircle.setOnDismissListener(this);
}
@@ -220,8 +222,12 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
profile_image.setImageBitmap(image);
profileLink = mediaPath;
} else {
+ int bannerHeight = profile_banner.getMeasuredWidth() / 3;
+ if (bannerHeight > 0)
+ profile_banner.setMaxHeight(bannerHeight);
profile_banner.setImageBitmap(image);
- add_banner_btn.setVisibility(INVISIBLE);
+ addBannerBtn.setVisibility(INVISIBLE);
+ changeBannerBtn.setVisibility(VISIBLE);
bannerLink = mediaPath;
}
c.close();
@@ -240,16 +246,17 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
@Override
public void onClick(View v) {
+ int viewId = v.getId();
// select net profile image
- if (v.getId() == R.id.edit_pb) {
+ if (viewId == R.id.edit_pb) {
getMedia(REQ_PROFILE_IMG);
}
// select new banner image
- else if (v.getId() == R.id.edit_add_banner) {
+ else if (viewId == R.id.edit_add_banner || viewId == R.id.edit_banner) {
getMedia(REQ_PROFILE_BANNER);
}
// stop update
- else if (v.getId() == R.id.kill_button) {
+ else if (viewId == R.id.kill_button) {
loadingCircle.dismiss();
}
}
@@ -297,7 +304,11 @@ public class ProfileEditor extends AppCompatActivity implements OnClickListener,
Picasso.get().load(pbLink).into(profile_image);
if (user.hasBannerImg()) {
Picasso.get().load(bnLink).into(profile_banner);
- add_banner_btn.setVisibility(INVISIBLE);
+ addBannerBtn.setVisibility(INVISIBLE);
+ changeBannerBtn.setVisibility(VISIBLE);
+ } else {
+ addBannerBtn.setVisibility(VISIBLE);
+ changeBannerBtn.setVisibility(INVISIBLE);
}
name.setText(user.getUsername());
link.setText(user.getLink());
diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml
new file mode 100644
index 00000000..b581387a
--- /dev/null
+++ b/app/src/main/res/drawable/add.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml
index 33aed42e..856274b2 100644
--- a/app/src/main/res/layout/page_editprofile.xml
+++ b/app/src/main/res/layout/page_editprofile.xml
@@ -1,5 +1,6 @@
+ android:text="@string/editprofile_add_banner"
+ android:visibility="invisible" />
+
+
+ android:layout_marginEnd="@dimen/editprofile_image_margin"
+ android:layout_marginRight="@dimen/editprofile_image_margin">
+
+
+
+
+
+
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c42ab5dd..26d9e65e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -31,7 +31,7 @@
geblockt!
entblockt!
Tweet gelöscht!
- "antwort "
+ "an "
"gesendet von:"
Stummschalten
Stummschaltung aufheben
@@ -175,4 +175,5 @@
Liste gefolgt
Liste entfolgt
entfolgt!
+ Profilbild ändern
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c3576c39..d99416f0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -75,6 +75,7 @@
150dp
@dimen/toolbar_height
@dimen/profile_button_height
+ 40dp
36sp
@@ -102,7 +103,6 @@
5dp
4dp
- 20sp
12sp
56sp
5dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 008a07ba..c40dd28d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
delete database?
unfollow
unblock user
- answering
+ "to "
sent from:
un-mute user
Direct Message
@@ -181,7 +181,7 @@
Delete
Open in Browser
mute user
- Edit Profile
+ edit profile
save
add user to list
edit list
@@ -192,4 +192,5 @@
unfollow list
Userlist followed
Userlist unfollowed
+ Change profile image
\ No newline at end of file