2
0

Prepare for Android development.

[FIXED]     Naming of avatar images.
[FIXED]     Dependency, SDK & other Maven configuration.
[UPDATED]   Dependencies changed to stable versions.
This commit is contained in:
Maarten Billemont 2014-08-24 22:42:42 -04:00
parent 63b4c605e2
commit 89145d6e13
55 changed files with 86 additions and 95 deletions

View File

@ -5,7 +5,7 @@
<!-- PROJECT METADATA -->
<parent>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword</artifactId>
<version>GIT-SNAPSHOT</version>
</parent>
@ -13,7 +13,7 @@
<name>Master Password Algorithm Implementation</name>
<description>The implementation of the Master Password algorithm</description>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-algorithm</artifactId>
<packaging>jar</packaging>
@ -24,12 +24,12 @@
<dependency>
<groupId>com.lyndir.lhunath.opal</groupId>
<artifactId>opal-system</artifactId>
<version>GIT-SNAPSHOT</version>
<version>1.6-p6</version>
</dependency>
<dependency>
<groupId>com.lyndir.lhunath.opal</groupId>
<artifactId>opal-crypto</artifactId>
<version>GIT-SNAPSHOT</version>
<version>1.6-p6</version>
</dependency>
<!-- EXTERNAL DEPENDENCIES -->

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.collect.ImmutableSet;
import com.lyndir.lhunath.opal.system.logging.Logger;

View File

@ -1,6 +1,6 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.lyndir.lhunath.masterpassword.entity.*;
import com.lyndir.masterpassword.entity.*;
/**

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.collect.ImmutableList;
import com.lyndir.lhunath.opal.system.util.MetaObject;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.lyndir.lhunath.opal.system.util.MetaObject;
import com.lyndir.lhunath.opal.system.util.ObjectMeta;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;

View File

@ -1,18 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lyndir.lhunath.masterpassword" android:versionCode="1" android:versionName="GIT-SNAPSHOT">
package="com.lyndir.masterpassword"
android:versionCode="1"
android:versionName="GIT-SNAPSHOT">
<uses-sdk android:minSdkVersion="11"
android:targetSdkVersion="16" />
<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="19" />
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".UsersActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<application
android:icon="@drawable/icon"
android:label="@string/app_name"
android:allowBackup="true">
<activity android:name=".UsersActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

View File

@ -1,6 +1,6 @@
/*___Generated_by_IDEA___*/
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {

View File

@ -1,7 +1,7 @@
/*___Generated_by_IDEA___*/
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}
}

View File

@ -1,7 +1,7 @@
/*___Generated_by_IDEA___*/
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}
}

View File

@ -5,7 +5,7 @@
<!-- PROJECT METADATA -->
<parent>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword</artifactId>
<version>GIT-SNAPSHOT</version>
</parent>
@ -13,7 +13,7 @@
<name>Master Password Android</name>
<description>An Android application to the Master Password algorithm</description>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-android</artifactId>
<packaging>apk</packaging>
@ -24,12 +24,9 @@
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<!--configuration>
<proguard>
<skip>false</skip>
<config>proguard.cfg</config>
</proguard>
</configuration-->
<configuration>
<sdk>19</sdk>
</configuration>
</plugin>
</plugins>
</build>
@ -39,7 +36,7 @@
<!-- PROJECT REFERENCES -->
<dependency>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-algorithm</artifactId>
<version>GIT-SNAPSHOT</version>
</dependency>
@ -47,18 +44,13 @@
<dependency>
<groupId>com.jakewharton</groupId>
<artifactId>butterknife</artifactId>
<version>5.1.2</version>
</dependency>
<!-- clone https://github.com/mosabua/maven-android-sdk-deployer.git
run mvn install -P 4.4 -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>4.1.1.4</version>
<scope>provided</scope>
</dependency>
</dependencies>

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hello">Hello masterpassword-android!</string>
<string name="app_name">masterpassword-android</string>
<string name="app_name">Master Password</string>
<string name="avatar">User Avatar</string>
</resources>

View File

@ -1,13 +1,13 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import android.app.Activity;
import android.os.Bundle;
import android.widget.LinearLayout;
import butterknife.ButterKnife;
import butterknife.InjectView;
import com.lyndir.lhunath.masterpassword.model.Avatar;
import com.lyndir.lhunath.masterpassword.model.User;
import com.lyndir.lhunath.masterpassword.view.AvatarView;
import com.lyndir.masterpassword.model.Avatar;
import com.lyndir.masterpassword.model.User;
import com.lyndir.masterpassword.view.AvatarView;
public class UsersActivity extends Activity {

View File

@ -1,6 +1,6 @@
package com.lyndir.lhunath.masterpassword.model;
package com.lyndir.masterpassword.model;
import com.lyndir.lhunath.masterpassword.R;
import com.lyndir.masterpassword.R;
/**

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword.model;
package com.lyndir.masterpassword.model;
/**
* @author lhunath, 2014-08-20

View File

@ -1,13 +1,11 @@
package com.lyndir.lhunath.masterpassword.view;
package com.lyndir.masterpassword.view;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
import butterknife.ButterKnife;
import com.lyndir.lhunath.masterpassword.R;
import com.lyndir.lhunath.masterpassword.model.User;
import com.lyndir.masterpassword.R;
import com.lyndir.masterpassword.model.User;
/**

View File

@ -5,7 +5,7 @@
<!-- PROJECT METADATA -->
<parent>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword</artifactId>
<version>GIT-SNAPSHOT</version>
</parent>
@ -13,7 +13,7 @@
<name>Master Password CLI</name>
<description>A CLI interface to the Master Password algorithm</description>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-cli</artifactId>
<packaging>jar</packaging>
@ -59,7 +59,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.lyndir.lhunath.masterpassword.CLI</mainClass>
<mainClass>com.lyndir.masterpassword.CLI</mainClass>
</transformer>
</transformers>
<filters>
@ -84,7 +84,7 @@
<!-- PROJECT REFERENCES -->
<dependency>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-algorithm</artifactId>
<version>GIT-SNAPSHOT</version>
</dependency>

View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.io.LineReader;
import com.lyndir.lhunath.opal.system.logging.Logger;

View File

@ -5,7 +5,7 @@
<!-- PROJECT METADATA -->
<parent>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword</artifactId>
<version>GIT-SNAPSHOT</version>
</parent>
@ -13,7 +13,7 @@
<name>Master Password GUI</name>
<description>A GUI interface to the Master Password algorithm</description>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-gui</artifactId>
<packaging>jar</packaging>
@ -39,7 +39,7 @@
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.lyndir.lhunath.masterpassword.GUI</mainClass>
<mainClass>com.lyndir.masterpassword.GUI</mainClass>
</transformer>
</transformers>
<filters>
@ -64,7 +64,7 @@
<!-- PROJECT REFERENCES -->
<dependency>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword-algorithm</artifactId>
<version>GIT-SNAPSHOT</version>
</dependency>

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.apple.eawt.*;

View File

@ -1,6 +1,5 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.io.Resources;
import java.awt.*;
import javax.swing.*;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;

View File

@ -13,9 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import com.google.common.base.Optional;
import com.lyndir.lhunath.opal.system.util.TypeUtils;
import java.io.IOException;
import javax.swing.*;
@ -34,15 +33,13 @@ public class GUI implements UnlockFrame.SignInCallback {
public static void main(final String[] args)
throws IOException {
// Apple
Optional<? extends GUI> appleGUI = TypeUtils.newInstance( AppleGUI.class );
if (appleGUI.isPresent()) {
appleGUI.get().open();
return;
GUI gui;
try {
gui = TypeUtils.newInstance( AppleGUI.class );
} catch (RuntimeException e) {
gui = new GUI();
}
// All others
new GUI().open();
gui.open();
}
void open() {

View File

@ -1,9 +1,9 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
import com.google.common.collect.Iterables;
import com.lyndir.lhunath.masterpassword.util.Components;
import com.lyndir.masterpassword.util.Components;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.*;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import java.awt.*;
import java.awt.event.ActionEvent;

View File

@ -1,8 +1,8 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
import com.lyndir.lhunath.masterpassword.util.Components;
import com.lyndir.masterpassword.util.Components;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword;
package com.lyndir.masterpassword;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;

View File

@ -1,4 +1,4 @@
package com.lyndir.lhunath.masterpassword.util;
package com.lyndir.masterpassword.util;
import java.awt.*;
import javax.swing.*;

View File

@ -7,13 +7,13 @@
<parent>
<groupId>com.lyndir.lhunath</groupId>
<artifactId>lyndir</artifactId>
<version>GIT-SNAPSHOT</version>
<version>1.19</version>
</parent>
<name>Master Password</name>
<description>A Java implementation of the Master Password algorithm.</description>
<groupId>com.lyndir.lhunath.masterpassword</groupId>
<groupId>com.lyndir.masterpassword</groupId>
<artifactId>masterpassword</artifactId>
<version>GIT-SNAPSHOT</version>
<packaging>pom</packaging>