aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/build.gradle18
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/PasswordStore.java16
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java2
-rw-r--r--app/src/main/res/drawable/bottom_line.xml2
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml5
-rw-r--r--app/src/main/res/layout/fragment_to_clone_or_not.xml61
-rw-r--r--app/src/main/res/values/styles.xml2
7 files changed, 83 insertions, 23 deletions
diff --git a/app/build.gradle b/app/build.gradle
index d1022a07..ae88309a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,14 +3,14 @@ apply from: 'copyLibs.gradle' // enable 'copyLibs.gradle' script plugin
apply plugin: 'eclipse'
android {
- compileSdkVersion 21
+ compileSdkVersion 22
buildToolsVersion "21.1.2"
defaultConfig {
applicationId "com.zeapo.pwdstore"
minSdkVersion 15
- targetSdkVersion 21
- versionCode 32
- versionName "1.2.0.12"
+ targetSdkVersion 22
+ versionCode 33
+ versionName "1.2.0.13"
}
compileOptions {
@@ -25,17 +25,17 @@ android {
}
dependencies {
- compile "com.android.support:appcompat-v7:21.0.3"
- compile "com.android.support:recyclerview-v7:21.0.2"
+ compile "com.android.support:appcompat-v7:22.0.0"
+ compile "com.android.support:recyclerview-v7:22.0.0"
//compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':libraries:openpgp-api-lib')
- compile 'org.eclipse.jgit:org.eclipse.jgit:3.6.0.201411121045-m1'
+ compile 'org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r'
compile 'org.apache.commons:commons-io:1.3.2'
- compile 'com.jayway.android.robotium:robotium-solo:5.2.1'
+ compile 'com.jayway.android.robotium:robotium-solo:5.3.1'
}
tasks.findAll { // make all tasks whose name starts with 'assemble'...
it.name.startsWith 'assemble'
}.each { // ... depending on 'copyDependenciesIntoLibs' task from 'copyLibs.gradle' script plugin
it.dependsOn copyDependenciesIntoLibs
-}
+} \ No newline at end of file
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 74b134aa..073c24da 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -176,6 +176,18 @@ public class PasswordStore extends ActionBarActivity {
return super.onOptionsItemSelected(item);
}
+ public void openSettings(View view) {
+ Intent intent;
+
+ try {
+ intent = new Intent(this, UserPreference.class);
+ startActivity(intent);
+ } catch (Exception e) {
+ System.out.println("Exception caught :(");
+ e.printStackTrace();
+ }
+ }
+
public void getClone(View view){
Intent intent = new Intent(this, GitActivity.class);
intent.putExtra("Operation", GitActivity.REQUEST_CLONE);
@@ -284,6 +296,8 @@ public class PasswordStore extends ActionBarActivity {
fragmentTransaction.addToBackStack("passlist");
+ getSupportActionBar().show();
+
fragmentTransaction.replace(R.id.main_layout, plist, "PasswordsList");
fragmentTransaction.commit();
}
@@ -293,6 +307,8 @@ public class PasswordStore extends ActionBarActivity {
fragmentManager.popBackStack();
}
+ getSupportActionBar().hide();
+
ToCloneOrNot cloneFrag = new ToCloneOrNot();
fragmentTransaction.replace(R.id.main_layout, cloneFrag, "ToCloneOrNot");
fragmentTransaction.commit();
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 1dfa2047..6915ebd4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -190,7 +190,7 @@ public class PgpHandler extends ActionBarActivity implements OpenPgpServiceConne
@Override
public void run() {
Toast.makeText(PgpHandler.this,
- "onError id:" + error.getErrorId() + "\n\n" + error.getMessage(),
+ "Error from OpenKeyChain : " + error.getMessage(),
Toast.LENGTH_LONG).show();
Log.e(Constants.TAG, "onError getErrorId:" + error.getErrorId());
Log.e(Constants.TAG, "onError getMessage:" + error.getMessage());
diff --git a/app/src/main/res/drawable/bottom_line.xml b/app/src/main/res/drawable/bottom_line.xml
index a28cc6d3..323b03e0 100644
--- a/app/src/main/res/drawable/bottom_line.xml
+++ b/app/src/main/res/drawable/bottom_line.xml
@@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
- <solid android:color="@color/blue_grey_700"/>
+ <solid android:color="@color/blue_grey_500"/>
</shape>
</item>
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index d53a2201..d923350a 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -8,6 +8,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="com.zeapo.pwdstore.git.GitActivity"
android:background="@android:color/white">
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -21,7 +22,7 @@
style="@android:style/TextAppearance.Large"
android:gravity="left"
android:paddingBottom="6dp"
- android:textColor="@color/blue_grey_700"
+ android:textColor="@color/blue_grey_500"
android:background="@drawable/bottom_line"/>
<RelativeLayout
@@ -161,7 +162,7 @@
style="@android:style/TextAppearance.Large"
android:gravity="left"
android:paddingBottom="6dp"
- android:textColor="@color/blue_grey_700"
+ android:textColor="@color/blue_grey_500"
android:background="@drawable/bottom_line"/>
<EditText
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index 3aed7df4..f1f8cdd9 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -1,19 +1,62 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:background="@color/blue_grey_500"
+ android:orientation="vertical"
tools:context="com.zeapo.pwdstore.ToCloneOrNot">
<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="4">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/imageView"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_launcher"
+ android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/app_name"
+ android:layout_below="@+id/imageView"
+ android:layout_centerHorizontal="true"
+ android:textColor="@android:color/white"
+ android:textStyle="bold"/>
+
+ <Button
+ android:id="@+id/main_settings_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="openSettings"
+ android:background="@android:color/transparent"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="@string/action_settings"
+ android:textColor="@android:color/white"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginEnd="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:textStyle="bold"
+ android:textAllCaps="true"/>
+ </RelativeLayout>
+
+ <RelativeLayout
android:id="@+id/myRectangleView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="2"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
- android:background="@drawable/rectangle">
+ android:background="@android:color/white">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,9 +85,9 @@
android:textStyle="bold"
android:onClick="getClone"
android:text="@string/clone"
- android:layout_below="@+id/textView"
+ android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 08f50df7..e9c9b918 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/blue_grey_500</item>
<item name="colorPrimaryDark">@color/blue_grey_500</item>
- <item name="android:windowBackground">@color/blue_grey_100</item>
+ <item name="android:windowBackground">@color/blue_grey_50</item>
<item name="android:textColorPrimary">@color/teal_900</item>
<item name="android:textColor">@color/blue_grey_900</item>
</style>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-21 23:10:49 +0000