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

Use data binding for main content view

Browse Source
This commit is contained in:
Peter Stuifzand 2018-02-24 20:17:55 +01:00
parent 3737d28ba9
commit 40091c4e20
9 changed files with 211 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -24,7 +24,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

16
app/build.gradle
View File

@ -16,6 +16,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
}
dataBinding {
enabled = true
}
}
dependencies {
@ -24,8 +31,17 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:26.1.0'
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
// ViewModel and LiveData
implementation "android.arch.lifecycle:extensions:1.1.0"
annotationProcessor "android.arch.lifecycle:compiler:1.1.0"
// Java8 support for Lifecycles
implementation "android.arch.lifecycle:common-java8:1.1.0"
compile 'org.jsoup:jsoup:1.10.1'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

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

@ -6,44 +6,46 @@ import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
import android.view.View;
import android.widget.Toast;
import java.io.IOException;
import okhttp3.Call;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import eu.stuifzand.micropub.databinding.ActivityMainBinding;
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
// setContentView(R.layout.activity_main);
ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
PostViewModel model = ViewModelProviders.of(MainActivity.this).get(PostViewModel.class);
binding.setViewModel(model);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
});
// FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
// fab.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
// .setAction("Action", null).show();
// }
// });
}
@Override
@ -76,8 +78,6 @@ public class MainActivity extends AppCompatActivity {
AccountManager am = AccountManager.get(this);
Bundle options = new Bundle();
am.getAuthTokenByFeatures("Indieauth", "token", null, this, options, null, new OnTokenAcquired(true), null);
}
private class OnTokenAcquired implements AccountManagerCallback<Bundle> {
@ -103,19 +103,23 @@ public class MainActivity extends AppCompatActivity {
String token = bundle.getString(AccountManager.KEY_AUTHTOKEN);
if (sendMessage) {
EditText mEdit = (EditText) findViewById(R.id.content);
PostViewModel model = ViewModelProviders.of(MainActivity.this).get(PostViewModel.class);
AccountManager am = AccountManager.get(MainActivity.this);
Account[] accounts = am.getAccountsByType(bundle.getString("accountType"));
String accountName = bundle.getString("authAccount");
String micropub = null;
String micropubBackend = null;
for (Account account : accounts) {
if (account.name.equals(accountName)) {
micropub = am.getUserData(account, "micropub");
micropubBackend = am.getUserData(account, "micropub");
}
}
String micropubBackend = micropub;
Log.i("micropub", "Sending message to " + micropubBackend);
new PostMessageTask(MainActivity.this, token, mEdit).execute(micropubBackend, mEdit.getText().toString());
if (micropubBackend != null) {
Log.i("micropub", "Sending message to " + micropubBackend);
new PostMessageTask(MainActivity.this, token, model, micropubBackend)
.execute();
}
}
Log.d("micropub", "GetTokenForAccount Bundle is " + token);

23
app/src/main/java/eu/stuifzand/micropub/Post.java Normal file
View File

@ -0,0 +1,23 @@
package eu.stuifzand.micropub;
import okhttp3.FormBody;
public class Post {
private String content;
public Post(String content) {
this.content = content;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public void applyToFormBodyBuilder(FormBody.Builder builder) {
builder.add("content", content);
}
}

21
app/src/main/java/eu/stuifzand/micropub/PostMessageTask.java
View File

@ -3,8 +3,6 @@ package eu.stuifzand.micropub;
import android.content.Context;
import android.os.AsyncTask;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;
import java.io.IOException;
@ -19,25 +17,28 @@ import okhttp3.Response;
public class PostMessageTask extends AsyncTask<String, Void, String> {
private final String accessToken;
private EditText mEdit;
private PostViewModel postModel;
private String micropubBackend;
private WeakReference<Context> context;
public PostMessageTask(Context context, String accessToken, EditText mEdit) {
public PostMessageTask(Context context, String accessToken, PostViewModel postModel, String micropubBackend) {
this.context = new WeakReference<Context>(context);
this.accessToken = accessToken;
this.mEdit = mEdit;
assert postModel != null;
this.postModel = postModel;
this.micropubBackend = micropubBackend;
}
@Override
protected String doInBackground(String... strings) {
RequestBody formBody = new FormBody.Builder()
.add("content", strings[1])
.build();
FormBody.Builder builder = new FormBody.Builder();
builder.add("content", postModel.content.get());
RequestBody formBody = builder.build();
Request request = new Request.Builder()
.addHeader("Authorization", "Bearer " + accessToken)
.method("POST", formBody)
.url(strings[0])
.url(micropubBackend)
.build();
OkHttpClient client = new OkHttpClient();
@ -59,7 +60,7 @@ public class PostMessageTask extends AsyncTask<String, Void, String> {
}
protected void onPostExecute(String message) {
mEdit.setText("");
Toast.makeText(context.get(), message, Toast.LENGTH_SHORT).show();
postModel.content.set("");
}
}

13
app/src/main/java/eu/stuifzand/micropub/PostViewModel.java Normal file
View File

@ -0,0 +1,13 @@
package eu.stuifzand.micropub;
import android.arch.lifecycle.ViewModel;
import android.databinding.ObservableField;
public class PostViewModel extends ViewModel {
public final ObservableField<String> content = new ObservableField<>();
public PostViewModel() {
this.content.set("test");
}
}

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

@ -1,33 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="eu.stuifzand.micropub.MainActivity">
xmlns:tools="http://schemas.android.com/tools">
<android.support.design.widget.AppBarLayout
<data>
<variable
name="viewModel"
type="eu.stuifzand.micropub.PostViewModel" />
</data>
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:layout_height="match_parent"
tools:context="eu.stuifzand.micropub.MainActivity">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
<include layout="@layout/content_main" />
</android.support.design.widget.AppBarLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
<include layout="@layout/content_main" app:viewModel="@{viewModel}"/>
</android.support.design.widget.CoordinatorLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
</android.support.design.widget.CoordinatorLayout>
</layout>

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

@ -1,54 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
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">
xmlns:tools="http://schemas.android.com/tools">
<EditText
android:id="@+id/content"
android:layout_width="0dp"
android:layout_height="230dp"
android:layout_marginBottom="272dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:autoText="false"
android:background="@android:color/white"
android:ems="10"
android:gravity="top"
android:inputType="textMultiLine"
android:padding="3px"
android:singleLine="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<data>
<variable
name="viewModel"
type="eu.stuifzand.micropub.PostViewModel" />
</data>
<Button
android:id="@+id/btnPost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:onClick="sendPost"
android:text="Post"
app:layout_constraintEnd_toEndOf="@+id/content"
app:layout_constraintTop_toBottomOf="@+id/content" />
<android.support.constraint.ConstraintLayout
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">
<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>
<EditText
android:id="@+id/content"
android:layout_width="328dp"
android:layout_height="230dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:background="@android:color/white"
android:ems="10"
android:gravity="top"
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/labelCounter" />
<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/content"
app:layout_constraintTop_toBottomOf="@+id/content" />
<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" />
<TextView
android:id="@+id/labelCounter"
android:layout_width="74dp"
android:layout_height="0dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@{String.valueOf(viewModel.content.length)}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@{viewModel.content}"
app:layout_constraintBottom_toTopOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnPost" />
</android.support.constraint.ConstraintLayout>
</layout>

4
build.gradle
View File

@ -25,3 +25,7 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
ext {
archLifecycleVersion = "1.0.0"
}