Merge pull request #132 from schul-cloud/release/0.2.0

Release 0.2.0
hpi-schul-cloud · Jul 18, 2018 · 87befd2 · 87befd2
2 parents 8b42853 + 5bbaffc
commit 87befd2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,9 +15,9 @@ android {
         minSdkVersion 16
         targetSdkVersion 25
         testInstrumentationRunner "${applicationId}.runner.RxAndroidJUnitRunner"
-        versionCode 1002
+        versionCode 2000
         // Major -> Millions, Minor -> Thousands, Bugfix -> Hundreds. E.g 1.3.72 == 1,003,072
-        versionName '0.1.2'
+        versionName '0.2.0'
         vectorDrawables.useSupportLibrary = true
     }
 

diff --git a/app/src/main/java/org/schulcloud/mobile/ui/settings/SettingsActivity.java b/app/src/main/java/org/schulcloud/mobile/ui/settings/SettingsActivity.java
@@ -1,19 +1,30 @@
 package org.schulcloud.mobile.ui.settings;
 
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.net.Uri;
+import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.github.johnpersano.supertoasts.library.utils.PaletteUtils;
 
 import org.schulcloud.mobile.R;
 import org.schulcloud.mobile.data.local.PreferencesHelper;
 import org.schulcloud.mobile.data.model.Device;
 import org.schulcloud.mobile.data.model.Event;
+import org.schulcloud.mobile.data.sync.DeviceSyncService;
+import org.schulcloud.mobile.data.sync.EventSyncService;
 import org.schulcloud.mobile.ui.base.BaseActivity;
 import org.schulcloud.mobile.util.ViewUtil;
 import org.schulcloud.mobile.util.dialogs.DialogFactory;
@@ -54,7 +65,7 @@ public class SettingsActivity extends BaseActivity<SettingsMvpView, SettingsPres
     BootstrapButton btn_create_device;
     @BindView(R.id.devices_recycler_view)
     RecyclerView devices_recycler_view;
-    '/
+    */
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,10 +96,12 @@ protected void onCreate(Bundle savedInstanceState) {
         });
 
         // Notifications
+        /*
         btn_create_device.setOnClickListener(view -> mSettingsPresenter.registerDevice());
 
         devices_recycler_view.setAdapter(mDevicesAdapter);
         devices_recycler_view.setLayoutManager(new LinearLayoutManager(this));
+        */
 
         // About
         findViewById(R.id.settings_about_contributors).setOnLongClickListener(v -> {