Update sample

Author: Daniel Novak

build.gradle

@@ -1,11 +1,9 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.2.2'
     }
 }
 

library/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 1
         versionName VERSION_NAME
     }
@@ -24,12 +24,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:support-annotations:20.0.0'
+    compile 'com.android.support:appcompat-v7:22.1.1'
 }
 
-
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))

library/src/main/java/eu/inloop/viewmodel/base/ViewModelBaseActivity.java

@@ -2,12 +2,13 @@
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 
 import eu.inloop.viewmodel.AbstractViewModel;
 import eu.inloop.viewmodel.IView;
 import eu.inloop.viewmodel.ViewModelHelper;
 
-public abstract class ViewModelBaseActivity<T extends IView, R extends AbstractViewModel<T>> extends FragmentActivity implements IView {
+public abstract class ViewModelBaseActivity<T extends IView, R extends AbstractViewModel<T>> extends AppCompatActivity implements IView {
 
     private ViewModelHelper<T, R> mViewModeHelper = new ViewModelHelper<>();
 

sample/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         applicationId 'eu.inloop.viewmodel.sample'
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 1
         versionName '1.0'
     }
@@ -25,9 +25,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:support-annotations:20.0.0'
+    compile 'com.android.support:appcompat-v7:22.1.1'
     compile 'com.jakewharton:butterknife:5.1.2'
     compile project(':library')
 }

sample/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity

sample/src/main/java/eu/inloop/viewmodel/sample/activity/MainActivity.java

@@ -1,21 +1,20 @@
 package eu.inloop.viewmodel.sample.activity;
 
 import android.os.Bundle;
-import android.view.Window;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import eu.inloop.viewmodel.base.ViewModelBaseActivity;
 import eu.inloop.viewmodel.sample.R;
 import eu.inloop.viewmodel.sample.fragment.EmptyFragment;
 import eu.inloop.viewmodel.sample.fragment.UserListFragment;
 
 
-public class MainActivity extends ProjectBaseActivity {
+public class MainActivity extends ViewModelBaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.activity_main);
         ButterKnife.inject(this);
 
@@ -29,13 +28,4 @@ public Class getViewModelClass() {
         return null;
     }
 
-    @OnClick(R.id.button1)
-    public void onOpenFragmentClicked() {
-        getSupportFragmentManager().beginTransaction().replace(R.id.root_content, new EmptyFragment(), "empty-fragment").addToBackStack(null).commit();
-    }
-
-    @OnClick(R.id.button2)
-    public void closeClicked() {
-        finish();
-    }
 }

sample/src/main/java/eu/inloop/viewmodel/sample/activity/ProjectBaseActivity.java

@@ -1,5 +1,6 @@
 package eu.inloop.viewmodel.sample.fragment;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -10,7 +11,7 @@
 import eu.inloop.viewmodel.sample.R;
 
 
-public class EmptyFragment extends Fragment{
+public class EmptyFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

sample/src/main/java/eu/inloop/viewmodel/sample/fragment/EmptyFragment.java

@@ -8,20 +8,24 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import eu.inloop.viewmodel.base.ViewModelBaseFragment;
 import eu.inloop.viewmodel.sample.R;
 import eu.inloop.viewmodel.sample.viewmodel.UserListViewModel;
 import eu.inloop.viewmodel.sample.viewmodel.view.IUserListView;
 
-public class UserListFragment extends ProjectBaseFragment<IUserListView, UserListViewModel> implements IUserListView {
+public class UserListFragment extends ViewModelBaseFragment<IUserListView, UserListViewModel> implements IUserListView {
 
     @InjectView(android.R.id.progress)
     View mProgressView;
+    @InjectView(R.id.progress_text)
+    TextView mProgressText;
     @InjectView(android.R.id.list)
     ListView mListview;
 
@@ -43,6 +47,22 @@ public Class<UserListViewModel> getViewModelClass() {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.fragment_userlist, container, false);
         ButterKnife.inject(this, view);
+
+        final View headerView = inflater.inflate(R.layout.view_header_info, null, false);
+        headerView.findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getFragmentManager().beginTransaction().replace(R.id.root_content, new EmptyFragment(), "empty-fragment").addToBackStack(null).commit();
+            }
+        });
+        headerView.findViewById(R.id.button2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                getActivity().finish();
+                getActivity().startActivity(getActivity().getIntent());
+            }
+        });
+        mListview.addHeaderView(headerView, null, false);
         return view;
     }
 
@@ -53,25 +73,20 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         mListview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                getViewModel().deleteUser(i);
+                getViewModel().deleteUser(i - mListview.getHeaderViewsCount());
             }
         });
     }
 
     @Override
-    public void setUsers(List<String> users) {
+    public void showUsers(List<String> users) {
         mAdapter.setNotifyOnChange(false);
         mAdapter.clear();
         mAdapter.addAll(users);
         mAdapter.setNotifyOnChange(true);
         mAdapter.notifyDataSetChanged();
     }
-
-    @Override
-    public void showIntermediateProgress(boolean show) {
-        getActivity().setProgressBarIndeterminateVisibility(show);
-    }
-
+    
     @Override
     public void onStop() {
         super.onStop();
@@ -88,8 +103,9 @@ public void onDestroyView() {
     }
 
     @Override
-    public void showLoading() {
+    public void showLoading(float progress) {
         mProgressView.setVisibility(View.VISIBLE);
+        mProgressText.setText((int)(progress * 100) + "%");
     }
 
     @Override