Skip to content

Commit

Permalink
Work on SSHWizard
Browse files Browse the repository at this point in the history 
Adding some toasts in case of unsuccessful git repo cloning
Remove the useless 'check SSH' button
  • Loading branch information
@wizmer
wizmer committed Sep 11, 2016
1 parent d61a773 commit 44a8e1f
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 102 deletions.
2 changes: 1 addition & 1 deletion MobileOrg/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
minSdkVersion 17
targetSdkVersion 24
versionCode 1
versionName "1.0"
versionName "2.0.2"
}

useLibrary 'org.apache.http.legacy'
Expand Down
10 changes: 9 additions & 1 deletion MobileOrg/src/main/java/com/matburt/mobileorg/OrgNodeListActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;

import com.matburt.mobileorg.Gui.Outline.OutlineAdapter;
import com.matburt.mobileorg.Gui.SearchActivity;
Expand All @@ -36,6 +37,8 @@
import com.matburt.mobileorg.util.OrgUtils;
import com.matburt.mobileorg.util.PreferenceUtils;

import java.io.File;


/**
* An activity representing a list of OrgNodes. This activity
Expand Down Expand Up @@ -109,6 +112,12 @@ public void onClick(View view) {
public void onClick(DialogInterface dialog, int whichButton) {
String filename = input.getText().toString();
OrgFile newFile = new OrgFile(filename, filename);
File file = new File(newFile.getFilePath(OrgNodeListActivity.this));
if(file.exists()){
Toast.makeText(OrgNodeListActivity.this, R.string.file_exists, Toast.LENGTH_SHORT)
.show();
return;
}
newFile.addFile(OrgNodeListActivity.this);
((OutlineAdapter) recyclerView.getAdapter()).refresh();
Synchronizer.getInstance().addFile(filename);
Expand Down Expand Up @@ -310,7 +319,6 @@ private class SynchServiceReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
boolean syncStart = intent.getBooleanExtra(Synchronizer.SYNC_START, false);
boolean syncDone = intent.getBooleanExtra(Synchronizer.SYNC_DONE, false);
boolean showToast = intent.getBooleanExtra(Synchronizer.SYNC_SHOW_TOAST, false);
int progress = intent.getIntExtra(Synchronizer.SYNC_PROGRESS_UPDATE, -1);

if (syncStart) {
Expand Down
12 changes: 8 additions & 4 deletions MobileOrg/src/main/java/com/matburt/mobileorg/Synchronizers/JGitWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.os.AsyncTask;
import android.util.Log;
import android.widget.Toast;

import com.matburt.mobileorg.EditNodeActivity;
import com.matburt.mobileorg.OrgData.OrgFile;
import com.matburt.mobileorg.OrgData.OrgFileParser;
import com.matburt.mobileorg.OrgData.OrgProviderUtils;
import com.matburt.mobileorg.OrgNodeListActivity;
import com.matburt.mobileorg.R;
import com.matburt.mobileorg.Synchronizers.SshSessionFactory.ConnectionType;
import com.matburt.mobileorg.util.FileUtils;
Expand Down Expand Up @@ -347,13 +350,14 @@ protected void onPostExecute(Object exception) {
if (exception == null) {
Toast.makeText(context, "Synchronization successful !", Toast.LENGTH_LONG).show();
((Activity) context).finish();

Intent intent = new Intent(context, OrgNodeListActivity.class);
context.startActivity(intent);
return;
}

if(exception instanceof TransportException){
Toast.makeText(context, "Authentification failed", Toast.LENGTH_LONG).show();
}else if (exception instanceof InvalidRemoteException) {
Toast.makeText(context, "Path does not exist or is not a valid repository", Toast.LENGTH_SHORT).show();
if (exception instanceof InvalidRemoteException) {
Toast.makeText(context, "Path does not exist or is not a valid repository", Toast.LENGTH_LONG).show();
}else if(exception instanceof UnableToPushException) {
// git config receive.denyCurrentBranch ignore
Toast.makeText(context, "Push test failed. Make sure the repository is bare.", Toast.LENGTH_LONG).show();
Expand Down
14 changes: 7 additions & 7 deletions MobileOrg/src/main/res/layout/wizard_ssh.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@
android:inputType="number"
android:defaultValue="22"
android:singleLine="true"/>
<Button
android:layout_marginTop="20dp"
android:id="@+id/wizard_ssh_login_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_ssh"
android:textSize="20dp"/>
<!--<Button-->
<!--android:layout_marginTop="20dp"-->
<!--android:id="@+id/wizard_ssh_login_button"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="@string/login_ssh"-->
<!--android:textSize="20dp"/>-->
</LinearLayout>
<View
android:layout_width="fill_parent"
Expand Down
90 changes: 1 addition & 89 deletions MobileOrg/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<string name="date">Date</string>
<string name="time">Time</string>
<string name="auth_type">Authentication type:</string>
<string name="file_exists">This file exists already !</string>

<!-- toasts -->
<string name="unselectable_item">You cannot select this item</string>
Expand Down Expand Up @@ -277,95 +278,6 @@
<string name="title_agenda_title">Use agenda titles</string>
<string name="summary_agenda_title">Enables use of custom agenda titles. Needs resync of agenda file to take effect</string>
<string name="title_activity_scrolling">ScrollingActivity</string>
<string name="large_text">
"Material is the metaphor.\n\n"

"A material metaphor is the unifying theory of a rationalized space and a system of motion."
"The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
"technologically advanced and open to imagination and magic.\n"
"Surfaces and edges of the material provide visual cues that are grounded in reality. The "
"use of familiar tactile attributes helps users quickly understand affordances. Yet the "
"flexibility of the material creates new affordances that supercede those in the physical "
"world, without breaking the rules of physics.\n"
"The fundamentals of light, surface, and movement are key to conveying how objects move, "
"interact, and exist in space and in relation to each other. Realistic lighting shows "
"seams, divides space, and indicates moving parts.\n\n"

"Bold, graphic, intentional.\n\n"

"The foundational elements of print based design typography, grids, space, scale, color, "
"and use of imagery guide visual treatments. These elements do far more than please the "
"eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
"imagery, large scale typography, and intentional white space create a bold and graphic "
"interface that immerse the user in the experience.\n"
"An emphasis on user actions makes core functionality immediately apparent and provides "
"waypoints for the user.\n\n"

"Motion provides meaning.\n\n"

"Motion respects and reinforces the user as the prime mover. Primary user actions are "
"inflection points that initiate motion, transforming the whole design.\n"
"All action takes place in a single environment. Objects are presented to the user without "
"breaking the continuity of experience even as they transform and reorganize.\n"
"Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
"Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"

"3D world.\n\n"

"The material environment is a 3D space, which means all objects have x, y, and z "
"dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
"positive z-axis extending towards the viewer. Every sheet of material occupies a single "
"position along the z-axis and has a standard 1dp thickness.\n"
"On the web, the z-axis is used for layering and not for perspective. The 3D world is "
"emulated by manipulating the y-axis.\n\n"

"Light and shadow.\n\n"

"Within the material environment, virtual lights illuminate the scene. Key lights create "
"directional shadows, while ambient light creates soft shadows from all angles.\n"
"Shadows in the material environment are cast by these two light sources. In Android "
"development, shadows occur when light sources are blocked by sheets of material at "
"various positions along the z-axis. On the web, shadows are depicted by manipulating the "
"y-axis only. The following example shows the card with a height of 6dp.\n\n"

"Resting elevation.\n\n"

"All material objects, regardless of size, have a resting elevation, or default elevation "
"that does not change. If an object changes elevation, it should return to its resting "
"elevation as soon as possible.\n\n"

"Component elevations.\n\n"

"The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
"does not vary from 6dp in one app to 16dp in another app).\n"
"Components may have different resting elevations across platforms, depending on the depth "
"of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"

"Responsive elevation and dynamic elevation offsets.\n\n"

"Some component types have responsive elevation, meaning they change elevation in response "
"to user input (e.g., normal, focused, and pressed) or system events. These elevation "
"changes are consistently implemented using dynamic elevation offsets.\n"
"Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
"to the component’s resting state. They ensure that elevation changes are consistent "
"across actions and component types. For example, all components that lift on press have "
"the same elevation change relative to their resting elevation.\n"
"Once the input event is completed or cancelled, the component will return to its resting "
"elevation.\n\n"

"Avoiding elevation interference.\n\n"

"Components with responsive elevations may encounter other components as they move between "
"their resting elevations and dynamic elevation offsets. Because material cannot pass "
"through other material, components avoid interfering with one another any number of ways, "
"whether on a per component basis or using the entire app layout.\n"
"On a component level, components can move or be removed before they cause interference. "
"For example, a floating action button (FAB) can disappear or move off screen before a "
"user picks up a card, or it can move if a snackbar appears.\n"
"On the layout level, design your app layout to minimize opportunities for interference. "
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n"
</string>
<string name="action_settings">Settings</string>

<!-- others -->
Expand Down

0 comments on commit 44a8e1f

Please sign in to comment.