Prepare compose activity
This commit is contained in:
parent
050d36e432
commit
b372fc1cf3
|
@ -403,6 +403,14 @@
|
||||||
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/AppTheme_NoActionBar_Fedilab" />
|
||||||
|
<activity
|
||||||
|
android:name="app.fedilab.android.activities.PixelfedComposeActivity"
|
||||||
|
android:launchMode="singleTop"
|
||||||
|
android:windowSoftInputMode="adjustResize"
|
||||||
|
android:fitsSystemWindows="true"
|
||||||
|
android:configChanges="orientation|screenSize"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:theme="@style/AppTheme_NoActionBar_Fedilab" />
|
||||||
<activity
|
<activity
|
||||||
android:name="app.fedilab.android.activities.EditProfileActivity"
|
android:name="app.fedilab.android.activities.EditProfileActivity"
|
||||||
android:windowSoftInputMode="stateAlwaysHidden"
|
android:windowSoftInputMode="stateAlwaysHidden"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -30,34 +30,33 @@
|
||||||
android:paddingTop="@dimen/toot_padding"
|
android:paddingTop="@dimen/toot_padding"
|
||||||
android:paddingRight="@dimen/toot_padding"
|
android:paddingRight="@dimen/toot_padding"
|
||||||
android:paddingBottom="@dimen/toot_padding">
|
android:paddingBottom="@dimen/toot_padding">
|
||||||
|
<LinearLayout
|
||||||
<TextView
|
android:id="@+id/pickup_picture"
|
||||||
android:visibility="gone"
|
android:layout_width="match_parent"
|
||||||
android:id="@+id/warning_message"
|
android:layout_height="450dp"
|
||||||
android:text="@string/reply_might_be_useless"
|
|
||||||
android:layout_margin="5dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:background="@drawable/red_border"
|
android:orientation="vertical"
|
||||||
android:textColor="@color/red_1"
|
>
|
||||||
android:layout_width="match_parent"
|
<TextView
|
||||||
android:layout_height="wrap_content" />
|
android:gravity="center"
|
||||||
|
android:textSize="18sp"
|
||||||
<EditText
|
android:textStyle="bold"
|
||||||
android:id="@+id/toot_cw_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_below="@+id/warning_message"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent"
|
android:text="@string/add_photo_pixelfed"/>
|
||||||
android:layout_height="wrap_content"
|
<TextView
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:animateLayoutChanges="true"
|
android:gravity="center"
|
||||||
android:hint="@string/toot_cw_placeholder"
|
android:textSize="14sp"
|
||||||
android:visibility="gone" />
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/add_photo_indication_pixelfed"/>
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:id="@+id/composer_container"
|
android:id="@+id/composer_container"
|
||||||
android:layout_below="@+id/toot_cw_content"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_above="@+id/bottom_bar_tooting"
|
android:layout_above="@+id/bottom_bar_tooting"
|
||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_marginEnd="0dp"
|
android:layout_marginEnd="0dp"
|
||||||
|
@ -77,48 +76,6 @@
|
||||||
android:minLines="4" />
|
android:minLines="4" />
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
||||||
<HorizontalScrollView
|
|
||||||
android:id="@+id/toolbar_scrollview"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="#e6e6e6"
|
|
||||||
android:scrollbars="none">
|
|
||||||
|
|
||||||
<include layout="@layout/editor_toolbar_linearlayout_horizontal" />
|
|
||||||
</HorizontalScrollView>
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:id="@+id/wysiwyg_container"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:layout_below="@+id/toolbar_scrollview"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_above="@+id/bottom_bar_tooting"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginEnd="0dp"
|
|
||||||
android:layout_marginLeft="0dp"
|
|
||||||
android:layout_marginRight="0dp"
|
|
||||||
android:layout_marginBottom="0dp"
|
|
||||||
android:fillViewport="true">
|
|
||||||
|
|
||||||
<com.github.irshulx.Editor
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:id="@+id/editor"
|
|
||||||
app:render_type="Editor"
|
|
||||||
android:hint="@string/toot_placeholder"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingBottom="100dp" />
|
|
||||||
</ScrollView>
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
|
||||||
android:visibility="gone"
|
|
||||||
android:id="@+id/suggestions"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/bottom_bar_tooting"
|
android:id="@+id/bottom_bar_tooting"
|
||||||
|
@ -152,22 +109,6 @@
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<HorizontalScrollView
|
|
||||||
android:id="@+id/picture_scrollview"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/toot_picture_container"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_vertical"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:maxHeight="100dp"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:padding="5dp"></LinearLayout>
|
|
||||||
</HorizontalScrollView>
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -213,19 +154,7 @@
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/ic_insert_photo" />
|
android:src="@drawable/ic_insert_photo" />
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/poll_action"
|
|
||||||
android:layout_width="28dp"
|
|
||||||
android:layout_height="28dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_marginLeft="5dp"
|
|
||||||
android:layout_marginRight="5dp"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:background="@color/transparent"
|
|
||||||
android:contentDescription="@string/poll"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
android:src="@drawable/ic_view_list_poll"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/toot_visibility"
|
android:id="@+id/toot_visibility"
|
||||||
|
@ -236,21 +165,10 @@
|
||||||
android:layout_marginRight="5dp"
|
android:layout_marginRight="5dp"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:background="@color/transparent"
|
android:background="@color/transparent"
|
||||||
android:contentDescription="@string/toot_visibility_tilte"
|
android:contentDescription="@string/post_visibility_tilte"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/ic_public" />
|
android:src="@drawable/ic_public" />
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/toot_cw"
|
|
||||||
android:layout_width="40dp"
|
|
||||||
android:layout_height="28dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_marginLeft="5dp"
|
|
||||||
android:layout_marginRight="5dp"
|
|
||||||
android:adjustViewBounds="true"
|
|
||||||
android:background="@color/transparent"
|
|
||||||
android:text="@string/cw"
|
|
||||||
android:textSize="20sp" />
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/toot_emoji"
|
android:id="@+id/toot_emoji"
|
||||||
|
@ -284,7 +202,7 @@
|
||||||
android:layout_gravity="end"
|
android:layout_gravity="end"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:padding="0dp"
|
android:padding="0dp"
|
||||||
android:text="@string/toot_it" />
|
android:text="@string/post" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -292,8 +210,7 @@
|
||||||
android:id="@+id/toot_sensitive"
|
android:id="@+id/toot_sensitive"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/toot_sensitive"
|
android:text="@string/toot_sensitive" />
|
||||||
android:visibility="gone" />
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
|
@ -1227,4 +1227,7 @@
|
||||||
<string name="change_app_icon_experimental">Change app icon</string>
|
<string name="change_app_icon_experimental">Change app icon</string>
|
||||||
<string name="click_to_change_the_app_icon">Click to change the app icon</string>
|
<string name="click_to_change_the_app_icon">Click to change the app icon</string>
|
||||||
<string name="post">Post</string>
|
<string name="post">Post</string>
|
||||||
|
<string name="post_visibility_tilte">Visibility of the post</string>
|
||||||
|
<string name="add_photo_pixelfed">Click here to add photos</string>
|
||||||
|
<string name="add_photo_indication_pixelfed">Accepted Formats: jpeg, png, gif \n\nMax File Size: 15 MB \n\nAlbums can contain up to 4 photos or videos</string>
|
||||||
</resources>
|
</resources>
|
Loading…
Reference in New Issue