Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of framagit.org:tom79/fedilab into develop

This commit is contained in:
tom79 2019-08-05 16:03:13 +02:00
parent bf328b11e1 de29b2fa8f
commit 60ed32f970
4 changed files with 77 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -240,15 +240,19 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
} }
}); });
View fake_actionbar = findViewById(R.id.fake_actionbar);
final ImageButton account_menu = findViewById(R.id.account_menu); final ImageButton account_menu = findViewById(R.id.account_menu);
ImageButton action_more = findViewById(R.id.action_more); ImageButton action_more = findViewById(R.id.action_more);
ImageButton action_back = findViewById(R.id.action_back); ImageButton action_back = findViewById(R.id.action_back);
if(theme == Helper.THEME_LIGHT){ if(theme == Helper.THEME_LIGHT){
fake_actionbar.setBackgroundColor(ContextCompat.getColor(ShowAccountActivity.this, R.color.light_grey));
changeDrawableColor(getApplicationContext(),action_more,R.color.dark_icon); changeDrawableColor(getApplicationContext(),action_more,R.color.dark_icon);
changeDrawableColor(getApplicationContext(),account_menu,R.color.dark_icon); changeDrawableColor(getApplicationContext(),account_menu,R.color.dark_icon);
changeDrawableColor(getApplicationContext(),action_back,R.color.dark_icon); changeDrawableColor(getApplicationContext(),action_back,R.color.dark_icon);
} }
if(theme == THEME_BLACK){
fake_actionbar.setBackgroundColor(ContextCompat.getColor(ShowAccountActivity.this, R.color.light_black));
}
account_menu.setOnClickListener(new View.OnClickListener() { account_menu.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

10
app/src/main/res/drawable/default_banner.xml Normal file
View File

File diff suppressed because one or more lines are too long

64
app/src/main/res/layout-sw600dp/activity_show_account.xml
View File

@ -53,6 +53,7 @@
android:layout_height="@dimen/layout_height_header" android:layout_height="@dimen/layout_height_header"
android:contentDescription="@string/profile_banner" android:contentDescription="@string/profile_banner"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/default_banner"
app:layout_collapseMode="parallax" app:layout_collapseMode="parallax"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -93,39 +94,38 @@
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toEndOf="@id/account_pp" app:layout_constraintStart_toEndOf="@id/account_pp"
app:layout_constraintTop_toBottomOf="@id/banner_pp" /> app:layout_constraintTop_toBottomOf="@id/banner_pp" />
<RelativeLayout
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="match_parent"
android:background="@color/black"
android:alpha="0.5"
android:layout_height="wrap_content"
>
<ImageButton
android:id="@+id/action_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_back"
android:src="@drawable/ic_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton <View
android:id="@+id/account_menu" android:id="@+id/fake_actionbar"
android:layout_width="40dp" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginTop="5dp" android:alpha="0.4"
android:layout_marginEnd="10dp" android:background="@color/black"
android:background="?attr/selectableItemBackgroundBorderless" app:layout_constraintTop_toTopOf="parent" />
android:contentDescription="@string/open_menu"
android:src="@drawable/ic_more_vert" <ImageButton
app:layout_constraintEnd_toEndOf="parent" android:id="@+id/action_back"
app:layout_constraintTop_toTopOf="parent" /> android:layout_width="40dp"
</RelativeLayout> android:layout_height="40dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_back"
android:src="@drawable/ic_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/account_menu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/open_menu"
android:src="@drawable/ic_more_vert"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

59
app/src/main/res/layout/activity_show_account.xml
View File

@ -52,6 +52,7 @@
android:layout_height="@dimen/layout_height_header" android:layout_height="@dimen/layout_height_header"
android:contentDescription="@string/profile_banner" android:contentDescription="@string/profile_banner"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/default_banner"
app:layout_collapseMode="parallax" app:layout_collapseMode="parallax"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -94,39 +95,39 @@
app:layout_constraintStart_toEndOf="@id/account_pp" app:layout_constraintStart_toEndOf="@id/account_pp"
app:layout_constraintTop_toBottomOf="@id/banner_pp" /> app:layout_constraintTop_toBottomOf="@id/banner_pp" />
<RelativeLayout <View
app:layout_constraintStart_toStartOf="parent" android:id="@+id/fake_actionbar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp"
android:alpha="0.4"
android:background="@color/black" android:background="@color/black"
android:alpha="0.5" app:layout_constraintTop_toTopOf="parent" />
android:layout_height="wrap_content"
>
<ImageButton
android:id="@+id/action_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_back"
android:src="@drawable/ic_back"
android:layout_alignParentStart="true" />
<ImageButton
android:id="@+id/account_menu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/open_menu"
android:src="@drawable/ic_more_vert"
android:layout_alignParentEnd="true" />
</RelativeLayout>
<ImageButton
android:id="@+id/action_back"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentStart="true"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_back"
android:src="@drawable/ic_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/account_menu"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="5dp"
android:layout_marginEnd="10dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/open_menu"
android:src="@drawable/ic_more_vert"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>