peter/micropub-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup scrolling view of the main posting interface

Browse Source 
- Remove signin button
This commit is contained in:
Peter Stuifzand 2018-02-25 14:16:24 +01:00
parent fffa9b73b9
commit e0456bc497
4 changed files with 112 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,8 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -43,16 +44,7 @@
</activity>
<activity android:name=".eu.stuifzand.micropub.auth.WebSigninActivity" />
<activity android:name=".eu.stuifzand.micropub.auth.AuthenticationActivity" />
<activity
android:name=".eu.stuifzand.micropub.auth.AuthenticatedActivity"
android:label="@string/title_activity_authenticated"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="eu.stuifzand.micropub.MainActivity" />
</activity>
<activity android:name=".eu.stuifzand.micropub.auth.AccountsActivity"></activity>
<activity android:name=".eu.stuifzand.micropub.auth.AccountsActivity" />
<service
android:name=".eu.stuifzand.micropub.auth.AuthenticatorService"

3
app/src/main/java/eu/stuifzand/micropub/MainActivity.java
View File

@ -18,6 +18,7 @@ import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.widget.Toast;
import java.io.IOException;
@ -34,7 +35,7 @@ public class MainActivity extends AppCompatActivity {
ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
PostViewModel model = ViewModelProviders.of(MainActivity.this).get(PostViewModel.class);
binding.setViewModel(model);
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);

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

@ -28,7 +28,11 @@
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_main" app:viewModel="@{viewModel}"/>
<include
layout="@layout/content_main"
android:layout_height="607dp"
app:viewModel="@{viewModel}"
tools:layout_editor_absoluteY="-4dp" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"

191
app/src/main/res/layout/content_main.xml
View File

@ -4,108 +4,121 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="viewModel"
type="eu.stuifzand.micropub.PostViewModel" />
</data>
<android.support.constraint.ConstraintLayout
<ScrollView
tools:context="eu.stuifzand.micropub.MainActivity"
tools:showIn="@layout/activity_main"
android:layout_marginTop="56dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/holo_blue_bright"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="eu.stuifzand.micropub.MainActivity"
tools:showIn="@layout/activity_main">
android:background="@color/colorPrimary"
>
<EditText
android:id="@+id/content"
android:layout_width="328dp"
android:layout_height="230dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:background="@android:color/white"
android:ems="10"
android:gravity="top"
android:hint="Content"
android:inputType="textMultiLine"
android:padding="3dp"
android:singleLine="false"
android:text="@={viewModel.content}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editInReplyTo" />
<Button
android:id="@+id/btnPost"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:onClick="sendPost"
android:text="Post"
app:layout_constraintEnd_toEndOf="@+id/editCategory"
app:layout_constraintTop_toBottomOf="@+id/editCategory" />
android:orientation="vertical">
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginStart="8dp"
android:onClick="startSignin"
android:text="Sign in"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="always"
android:scrollbars="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<TextView
android:id="@+id/labelCounter"
android:layout_width="83dp"
android:layout_height="23dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="16dp"
android:text="@{String.valueOf(viewModel.content.length)}"
android:textAlignment="textEnd"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@+id/editInReplyTo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<EditText
android:id="@+id/editInReplyTo"
android:layout_width="0dp"
android:layout_height="46dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:ems="10"
android:hint="In reply to"
android:imeOptions="actionNext"
android:inputType="textUri"
android:nextFocusForward="@id/content"
android:padding="3dp"
android:singleLine="true"
android:text="@={viewModel.inReplyTo}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/labelCounter" />
<EditText
android:id="@+id/editCategory"
android:layout_width="0dp"
android:layout_height="36dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:background="@android:color/background_light"
android:ems="10"
android:hint="Categories (space separated)"
android:inputType="text"
android:singleLine="true"
android:text="@={viewModel.category}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/content" />
<TextView
android:id="@+id/labelCounter"
android:layout_width="83dp"
android:layout_height="23dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="16dp"
android:text="@{String.valueOf(viewModel.content.length)}"
android:textAlignment="textEnd"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@+id/editInReplyTo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
android:layout_marginRight="8dp"
android:gravity="end" />
<EditText
android:id="@+id/editInReplyTo"
android:layout_width="0dp"
android:layout_height="46dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:background="@android:color/background_light"
android:ems="10"
android:hint="In reply to"
android:inputType="textUri"
android:singleLine="true"
android:text="@={viewModel.inReplyTo}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/labelCounter" />
<EditText
android:id="@+id/editCategory"
android:layout_width="0dp"
android:layout_height="46dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:ems="10"
android:hint="Categories (space separated)"
android:imeOptions="actionDone"
android:inputType="text"
android:padding="3dp"
android:singleLine="true"
android:text="@={viewModel.category}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/content" />
<Button
android:id="@+id/btnPost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp"
android:onClick="sendPost"
android:text="Post"
app:layout_constraintEnd_toEndOf="@+id/editCategory"
app:layout_constraintTop_toBottomOf="@+id/editCategory" />
<EditText
android:id="@+id/content"
android:layout_width="0dp"
android:layout_height="230dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:ems="10"
android:gravity="top"
android:hint="Content"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:nextFocusForward="@id/editCategory"
android:padding="3dp"
android:singleLine="false"
android:text="@={viewModel.content}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editInReplyTo" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</layout>