Skip to content

Commit

Permalink
Getting ready for 1.1.0
Browse files Browse the repository at this point in the history
- updating version number
- solve bug in back button
- cleanup
  • Loading branch information
dimtion committed May 11, 2015
1 parent e993e8b commit ccc0038
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 23 deletions.
1 change: 0 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ I know, a todo file is never a good practice

## Planned for future releases
- Save link in a draft in case of an error
- Edit/Show link when sharing (perhaps useless if nobody asks)
- Nicer UI

## Q&A
Expand Down
6 changes: 3 additions & 3 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.8.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
</component>
</module>

6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.dimtion.shaarlier"
minSdkVersion 15
targetSdkVersion 21
versionCode 11
versionName "1.1.0"
versionCode 12
versionName "1.1.0b"
}
buildTypes {
release {
Expand All @@ -21,6 +21,6 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'org.jsoup:jsoup:1.8.1'
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:label="@string/title_activity_add"
android:noHistory="true"
android:taskAffinity="com.dimtion.Shaarlier.share"
android:theme="@android:style/Theme.Holo.Dialog">
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
*/
class AutoCompleteWrapper {

private MultiAutoCompleteTextView a_textView;
private Context a_context;
private final MultiAutoCompleteTextView a_textView;
private final Context a_context;

public AutoCompleteWrapper(final MultiAutoCompleteTextView textView, Context context) {
this.a_textView = textView;
Expand All @@ -41,8 +41,8 @@ public AutoCompleteWrapper(final MultiAutoCompleteTextView textView, Context con
AutoCompleteRetriever task = new AutoCompleteRetriever();
task.execute();
}
class AutoCompleteRetriever extends AsyncTask<String, Void, ArrayList<String>> {

private class AutoCompleteRetriever extends AsyncTask<String, Void, ArrayList<String>> {
@Override
protected ArrayList<String> doInBackground(String... urls) {
// params comes from the execute() call: params[0] is the url.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean login() throws IOException {
// Update the cookie, the token and the date
// Assume being logged in
//
public void retrievePostLinkToken(String encodedSharedLink) throws IOException {
void retrievePostLinkToken(String encodedSharedLink) throws IOException {
final String postFormUrl = this.m_shaarliUrl + "?post=" + encodedSharedLink;
Connection.Response postFormPage = Jsoup.connect(postFormUrl)
.followRedirects(true)
Expand Down
10 changes: 0 additions & 10 deletions app/src/main/res/layout/share_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@
android:text="@string/text_description"
android:textAppearance="?android:attr/textAppearanceMedium" />

<Space
android:id="@+id/dropDownAnchor"
android:layout_width="match_parent"
android:layout_height="0dp" />

<EditText
android:id="@+id/description"
android:layout_width="match_parent"
Expand All @@ -84,8 +79,6 @@
android:singleLine="false"
android:textSize="15sp" />



<MultiAutoCompleteTextView
android:id="@+id/tags"
android:layout_width="match_parent"
Expand All @@ -95,7 +88,6 @@
android:hint="@string/tags_hint"
android:inputType="textAutoComplete" />


<CheckBox
android:id="@+id/private_share"
android:layout_width="match_parent"
Expand All @@ -104,7 +96,5 @@
android:layout_marginTop="0dp"
android:checked="false"
android:text="@string/private_share" />


</LinearLayout>
</ScrollView>

0 comments on commit ccc0038

Please sign in to comment.