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

fixes

This commit is contained in:
tom79 2019-11-09 16:02:19 +01:00
parent 65538d0242
commit fe97276e47
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -429,7 +429,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme_NoActionBar_Fedilab" /> android:theme="@style/AppThemeDark" />
<activity <activity
android:name="app.fedilab.android.activities.PixelfedComposeActivity" android:name="app.fedilab.android.activities.PixelfedComposeActivity"
android:launchMode="singleTop" android:launchMode="singleTop"
@ -437,7 +437,7 @@
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme_NoActionBar_Fedilab" /> android:theme="@style/AppThemeDark" />
<activity <activity
android:name="app.fedilab.android.activities.EditProfileActivity" android:name="app.fedilab.android.activities.EditProfileActivity"
android:windowSoftInputMode="stateAlwaysHidden" android:windowSoftInputMode="stateAlwaysHidden"

9
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -303,6 +303,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
case Helper.THEME_LIGHT: case Helper.THEME_LIGHT:
setTheme(R.style.AppTheme_Fedilab); setTheme(R.style.AppTheme_Fedilab);
break; break;
case Helper.THEME_DARK:
setTheme(R.style.AppThemeDark);
break;
case Helper.THEME_BLACK: case Helper.THEME_BLACK:
setTheme(R.style.AppThemeBlack); setTheme(R.style.AppThemeBlack);
break; break;
@ -321,7 +324,8 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
autocomplete = false; autocomplete = false;
setContentView(R.layout.activity_toot); if (getSupportActionBar() != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
ActionBar actionBar = getSupportActionBar(); ActionBar actionBar = getSupportActionBar();
if (actionBar != null) { if (actionBar != null) {
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
@ -377,12 +381,13 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
} }
} }
}); });
title = actionBar.getCustomView().findViewById(R.id.toolbar_title); title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
pp_actionBar = actionBar.getCustomView().findViewById(R.id.pp_actionBar); pp_actionBar = actionBar.getCustomView().findViewById(R.id.pp_actionBar);
pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress); pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress);
} }
setContentView(R.layout.activity_toot);
//By default the toot is not restored so the id -1 is defined //By default the toot is not restored so the id -1 is defined
currentToId = -1; currentToId = -1;

6
app/src/main/res/layout/activity_pixelfed_compose.xml
View File

@ -183,7 +183,8 @@
android:background="@color/transparent" android:background="@color/transparent"
android:contentDescription="@string/post_visibility_tilte" android:contentDescription="@string/post_visibility_tilte"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_public" /> android:src="@drawable/ic_public"
android:tint="?attr/iconColor"/>
<ImageButton <ImageButton
@ -199,7 +200,8 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_insert_emoticon" /> android:src="@drawable/ic_insert_emoticon"
android:tint="?attr/iconColor"/>
<CheckBox <CheckBox
android:id="@+id/toot_sensitive" android:id="@+id/toot_sensitive"

24
app/src/main/res/layout/activity_toot.xml
View File

@ -166,7 +166,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxHeight="100dp" android:maxHeight="100dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="5dp"></LinearLayout> android:padding="5dp"/>
</HorizontalScrollView> </HorizontalScrollView>
<LinearLayout <LinearLayout
@ -206,12 +206,12 @@
android:layout_height="28dp" android:layout_height="28dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@color/transparent" android:background="@color/transparent"
android:contentDescription="@string/toot_select_image" android:contentDescription="@string/toot_select_image"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_insert_photo" /> android:src="@drawable/ic_insert_photo"
android:tint="?attr/iconColor"/>
<ImageButton <ImageButton
android:id="@+id/poll_action" android:id="@+id/poll_action"
@ -225,6 +225,7 @@
android:contentDescription="@string/poll" android:contentDescription="@string/poll"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_view_list_poll" android:src="@drawable/ic_view_list_poll"
android:tint="?attr/iconColor"
android:visibility="gone" /> android:visibility="gone" />
<ImageButton <ImageButton
@ -238,19 +239,17 @@
android:background="@color/transparent" android:background="@color/transparent"
android:contentDescription="@string/toot_visibility_tilte" android:contentDescription="@string/toot_visibility_tilte"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_public" /> android:src="@drawable/ic_public"
android:tint="?attr/iconColor"/>
<Button <Button
android:id="@+id/toot_cw" android:id="@+id/toot_cw"
android:layout_width="40dp" android:layout_width="wrap_content"
android:layout_height="28dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="5dp" style="@style/Widget.AppCompat.Button.Small"
android:layout_marginRight="5dp"
android:adjustViewBounds="true"
android:background="@color/transparent"
android:text="@string/cw" android:text="@string/cw"
android:textSize="20sp" /> />
<ImageButton <ImageButton
android:id="@+id/toot_emoji" android:id="@+id/toot_emoji"
@ -265,7 +264,8 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/ic_insert_emoticon" /> android:src="@drawable/ic_insert_emoticon"
android:tint="?attr/iconColor"/>
<TextView <TextView
android:id="@+id/toot_space_left" android:id="@+id/toot_space_left"