Moved synchronize now in the main menu

Author: astonbitecode

.travis.yml

@@ -14,7 +14,7 @@ android:
   - android-16
 before_install:
 - openssl aes-256-cbc -K $encrypted_2f32dd076c5d_key -iv $encrypted_2f32dd076c5d_iv
-  -in rkl.jks.enc -out ks/rkl.jks -d
+  -in ./rkl.jks.enc -out ks/rkl.jks -d
 - sudo apt-get update -qq
 - sudo apt-get install -qq gcc-arm-linux-androideabi
 - sh rust-build/pre_build_rust_keylock_android.sh

java/res/drawable-hdpi/cloudsync.png

@@ -30,33 +30,13 @@
                     android:text="Configuration"
                     android:textAppearance="?android:attr/textAppearanceLarge"/>
 
-            <GridLayout
-                    android:layout_width="match_parent"
+            <TextView
+                    android:id="@+id/nextcloudLabel"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="20sp"
-                    android:columnCount="2"
-                    android:gravity="center|top"
-                    android:orientation="horizontal">
-
-                <TextView
-                        android:id="@+id/nextcloudLabel"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left|center"
-                        android:text="Nextcloud"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                <Button
-                        android:id="@+id/synchronizeButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:background="@android:color/transparent"
-                        android:drawableTop="@drawable/synchronizesmall"
-                        android:text="Synchronize now"
-                        android:textAppearance="?android:textAppearanceSmall"/>
-            </GridLayout>
+                    android:layout_gravity="left|center"
+                    android:text="Nextcloud"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
             <TextView
                     android:id="@+id/urlLabel"

java/res/drawable-hdpi/synchronizesmall.png

@@ -84,6 +84,16 @@
                     android:drawableTop="@drawable/settings"
                     android:text="Configuration"/>
 
+            <Button
+                    android:id="@+id/synchronizeButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="fill_horizontal"
+                    android:layout_marginTop="20sp"
+                    android:background="@android:color/transparent"
+                    android:drawableTop="@drawable/cloudsync"
+                    android:text="Synchronize now"/>
+
             <Button
                     android:id="@+id/exitButton"
                     android:layout_width="wrap_content"
@@ -93,6 +103,8 @@
                     android:background="@android:color/transparent"
                     android:drawableTop="@drawable/close"
                     android:text="Exit"/>
+
+
         </GridLayout>
     </ScrollView>
 

java/res/layout/fragment_edit_configuration.xml

@@ -68,14 +68,6 @@ public void onClick(View view) {
         } else if (view.getId() == R.id.editConfigurationCancelButton) {
             Log.d(TAG, "Clicked Cancel in configuration");
             InterfaceWithRust.INSTANCE.go_to_menu(Defs.MENU_MAIN);
-        } else if (view.getId() == R.id.synchronizeButton) {
-            Log.d(TAG, "Clicked Synchronize now in configuration");
-
-            InterfaceWithRust.INSTANCE.go_to_menu(Defs.MENU_SYNCHRONIZE);
-
-            MainActivity mainActivity = MainActivity.getActiveActivity();
-            Runnable uiRunnable = new UiThreadRunnable(mainActivity);
-            mainActivity.runOnUiThread(uiRunnable);
         }
     }
 
@@ -84,8 +76,6 @@ private void prepareUiElements(View v) {
         ob.setOnClickListener(this);
         Button cb = (Button) v.findViewById(R.id.editConfigurationCancelButton);
         cb.setOnClickListener(this);
-        Button sb = (Button) v.findViewById(R.id.synchronizeButton);
-        sb.setOnClickListener(this);
 
         EditText urlText = (EditText) v.findViewById(R.id.editNextcloudUrl);
         urlText.setText(strings.get(0));
@@ -118,18 +108,4 @@ private void restore(Bundle state) {
         }
     }
 
-    private class UiThreadRunnable implements Runnable {
-        private MainActivity mainActivity = null;
-
-        public UiThreadRunnable(MainActivity mainActivity) {
-            this.mainActivity = mainActivity;
-        }
-
-        @Override
-        public void run() {
-            PleaseWait pw = new PleaseWait();
-            mainActivity.setBackButtonHandler(null);
-            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
-        }
-    }
 }

java/res/layout/fragment_main_menu.xml

@@ -1,5 +1,6 @@
 package org.astonbitecode.rustkeylock.fragments;
 
+import org.astonbitecode.rustkeylock.MainActivity;
 import org.astonbitecode.rustkeylock.R;
 import org.astonbitecode.rustkeylock.api.InterfaceWithRust;
 import org.astonbitecode.rustkeylock.handlers.back.BackButtonHandler;
@@ -48,6 +49,8 @@ private void addButtonListeners(View rootView) {
         binp.setOnClickListener(this);
         Button bcfg = (Button) rootView.findViewById(R.id.mmEditConfigurationButton);
         bcfg.setOnClickListener(this);
+        Button sb = (Button) rootView.findViewById(R.id.synchronizeButton);
+        sb.setOnClickListener(this);
     }
 
     @Override
@@ -73,7 +76,15 @@ public void onClick(View view) {
         } else if (view.getId() == R.id.mmEditConfigurationButton) {
             Log.d(TAG, "The User Selected to edit the configuration");
             InterfaceWithRust.INSTANCE.go_to_menu(Defs.MENU_SHOW_CONFIGURATION);
-        } else {
+        } else if (view.getId() == R.id.synchronizeButton) {
+            Log.d(TAG, "Clicked Synchronize now in configuration");
+
+            InterfaceWithRust.INSTANCE.go_to_menu(Defs.MENU_SYNCHRONIZE);
+
+            MainActivity mainActivity = MainActivity.getActiveActivity();
+            Runnable uiRunnable = new UiThreadRunnable(mainActivity);
+            mainActivity.runOnUiThread(uiRunnable);
+        }else {
             Log.e(TAG, "The User selected a Menu that is not implemented yet in Rust");
         }
     }
@@ -83,4 +94,19 @@ public void onBackButton() {
         Log.d(TAG, "Back button pressed");
         InterfaceWithRust.INSTANCE.go_to_menu(Defs.MENU_EXIT);
     }
+
+    private class UiThreadRunnable implements Runnable {
+        private MainActivity mainActivity = null;
+
+        public UiThreadRunnable(MainActivity mainActivity) {
+            this.mainActivity = mainActivity;
+        }
+
+        @Override
+        public void run() {
+            PleaseWait pw = new PleaseWait();
+            mainActivity.setBackButtonHandler(null);
+            mainActivity.getFragmentManager().beginTransaction().replace(R.id.container, pw).commitAllowingStateLoss();
+        }
+    }
 }