Skip to content
Permalink
Browse files

Merge for 1.1.1 (#19)

* Added the foundation for Anonymous Account Signup and FirstStart Assistant.

* Further changes. Started Adding Setup Assitant including shiny colors

* Small changes

* Added Bootstrap to Resources

* Removed colors for the time being. Added some more logic.

* Small additions to SetupAssistant Logic

* Further work on the Assistant

* Small changes

* Further additions

* Added colors

* removed dev-menu-option

* small changes

* Swapped colors

* Anonymous Signup is working now

* Everything is working now. Last fixes needed

* Last fixes

* Added German translation and loading status for TOS

* Added logic for displaying message in ShortenActivity if Setup has not been run yet.

* Small changes

* Added Chinese Translation from master

* Added Chinese Translation from master (now for real)

* Added information about translations in About page

* Added Chinese translation / 添加中文翻译

Added Chinese translation / 添加中文翻译

* Added changes to Changelogs

* Update README.md

* Update README.md
  • Loading branch information...
michaelachmann committed Apr 25, 2017
1 parent af2e4cc commit e419b2f459d83512859170d75055376ceb4ae660
Showing with 12,973 additions and 232 deletions.
  1. +7 −1 CHANGELOG.md
  2. +2 −4 README.md
  3. +16 −12 app/build.gradle
  4. +16 −9 app/src/main/AndroidManifest.xml
  5. +587 −0 app/src/main/assets/css/bootstrap-theme.css
  6. +1 −0 app/src/main/assets/css/bootstrap-theme.css.map
  7. +6 −0 app/src/main/assets/css/bootstrap-theme.min.css
  8. +1 −0 app/src/main/assets/css/bootstrap-theme.min.css.map
  9. +6,757 −0 app/src/main/assets/css/bootstrap.css
  10. +1 −0 app/src/main/assets/css/bootstrap.css.map
  11. +6 −0 app/src/main/assets/css/bootstrap.min.css
  12. +1 −0 app/src/main/assets/css/bootstrap.min.css.map
  13. BIN app/src/main/assets/fonts/glyphicons-halflings-regular.eot
  14. +288 −0 app/src/main/assets/fonts/glyphicons-halflings-regular.svg
  15. BIN app/src/main/assets/fonts/glyphicons-halflings-regular.ttf
  16. BIN app/src/main/assets/fonts/glyphicons-halflings-regular.woff
  17. BIN app/src/main/assets/fonts/glyphicons-halflings-regular.woff2
  18. +4 −4 app/src/main/assets/github.html
  19. +2,377 −0 app/src/main/assets/js/bootstrap.js
  20. +7 −0 app/src/main/assets/js/bootstrap.min.js
  21. +13 −0 app/src/main/assets/js/npm.js
  22. +57 −0 app/src/main/assets/tos.html
  23. +59 −1 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/DisplayShortenedUrlActivity.java
  24. +22 −5 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/MainActivity.java
  25. +3 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SettingsActivity.java
  26. +582 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupActivity.java
  27. +114 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupFinalStepLoading.java
  28. +383 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupHelper.java
  29. +78 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupStep1Fragment.java
  30. +118 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupStep2CustomFragment.java
  31. +87 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupStep2DefaultFragment.java
  32. +161 −0 app/src/main/java/de/hirtenstrasse/michael/lnkshortener/SetupStep3LoginFragment.java
  33. +6 −0 app/src/main/res/color/primary_text_material_light.xml
  34. BIN app/src/main/res/drawable-hdpi/ic_check.png
  35. BIN app/src/main/res/drawable-mdpi/ic_check.png
  36. BIN app/src/main/res/drawable-xhdpi/ic_check.png
  37. BIN app/src/main/res/drawable-xxhdpi/ic_check.png
  38. +162 −109 app/src/main/res/layout/activity_display_shortened_url.xml
  39. +5 −3 app/src/main/res/layout/activity_main.xml
  40. +2 −2 app/src/main/res/layout/activity_settings.xml
  41. +30 −0 app/src/main/res/layout/activity_setup.xml
  42. +41 −16 app/src/main/res/layout/fragment_about.xml
  43. +120 −0 app/src/main/res/layout/fragment_final_step_loading.xml
  44. +12 −12 app/src/main/res/layout/fragment_main.xml
  45. +95 −0 app/src/main/res/layout/fragment_setup_step1.xml
  46. +94 −0 app/src/main/res/layout/fragment_setup_step2_custom.xml
  47. +140 −0 app/src/main/res/layout/fragment_setup_step2_default.xml
  48. +152 −0 app/src/main/res/layout/fragment_setup_step3_login.xml
  49. +115 −28 app/src/main/res/values-de/strings.xml
  50. +17 −0 app/src/main/res/values-v21/styles.xml
  51. +71 −4 app/src/main/res/values-zh/strings.xml
  52. +9 −3 app/src/main/res/values/colors.xml
  53. +2 −0 app/src/main/res/values/dimens.xml
  54. +80 −1 app/src/main/res/values/strings.xml
  55. +18 −2 app/src/main/res/values/styles.xml
  56. +5 −0 app/src/main/res/xml-de/changelog.xml
  57. +5 −0 app/src/main/res/xml/changelog_master.xml
  58. +35 −13 app/src/main/res/xml/main_settings.xml
  59. +1 −1 build.gradle
  60. +2 −2 gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,11 @@
# 1.1.1
## Versioncode 6
* Added Setup-Assistant
* Changed color theme
* Added Chinese translation

# 1.1.0
## Versionscode
## Versioncode 5
* Small Bugfixes
* Small fixes for English and German language
* Added Attributions to About page
@@ -1,10 +1,8 @@
<img src="/icons/LnkShortenerRobo512.png" align="left" height="114">
# LnkShortener [![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://img.shields.io/badge/license-GPLv3-blue.svg) [![Twitter Follow](https://img.shields.io/twitter/follow/lnkshortener.svg?style=social&label=Follow)](https://twitter.com/lnkshortener) <sup> [Facebook](https://fb.com/lnkshortener) | [Website](https://android.1n.pm)</sup>

<img src="/icons/LnkShortenerRobo512.png" style="float:left; height:114px" height="114">

LnkShortener is an Android app for shortening URLs. It is using [Polr](https://github.com/Cydrobolt/polr), an open-source URL shortener

**[Getting Started](#getting-started) | [App Stores](#app-stores) | [Contribute](#contribute)**
**[Getting Started](#getting-started) | [App Stores](#app-stores) | [Contribute](#contribute) | [Twitter @Lnkshortener](https://twitter.com/LnkShortener) | [Website](https://android.1n.pm)**

<img style="float:right; height:500px" height="500" align="right" src="/metadata/images/ScreenshotFramedEnglish.png" >

@@ -5,10 +5,10 @@ android {
buildToolsVersion "25.0.2"
defaultConfig {
applicationId "de.hirtenstrasse.michael.lnkshortener"
minSdkVersion 15
minSdkVersion 16
targetSdkVersion 25
versionCode 5
versionName "1.1.0"
versionCode 6
versionName "1.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
@@ -21,25 +21,29 @@ android {
lintOptions {
abortOnError false
}
useLibrary 'org.apache.http.legacy'

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:support-v4:25.1.0'
compile 'com.android.support:support-vector-drawable:25.1.0'
compile 'com.android.volley:volley:1.0.0'

compile 'com.android.support:design:25.1.0'
compile 'com.android.support:recyclerview-v7:25.1.0'
compile 'com.android.support:cardview-v7:25.1.0'

compile 'com.github.kenglxn.QRGen:android:2.2.0'
compile 'de.cketti.library.changelog:ckchangelog:1.2.2'



compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:support-vector-drawable:25.3.1'
compile 'com.android.volley:volley:1.0.0'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.github.kenglxn.QRGen:android:2.2.0'
compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
compile 'org.jsoup:jsoup:1.10.2'
testCompile 'junit:junit:4.12'
}
@@ -9,10 +9,10 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<activity android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
>
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

@@ -21,9 +21,9 @@
</activity>
<activity
android:name=".DisplayShortenedUrlActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/activity_display_url"
android:parentActivityName=".DisplayShortenedUrlActivity"
android:configChanges="orientation|keyboardHidden|screenSize">
android:parentActivityName=".DisplayShortenedUrlActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".DisplayShortenedUrlActivity" />
@@ -36,16 +36,23 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>

<activity
android:name=".SettingsActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/activity_settings"
android:parentActivityName=".DisplayShortenedUrlActivity"
android:configChanges="orientation|keyboardHidden|screenSize">
android:parentActivityName=".DisplayShortenedUrlActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".DisplayShortenedUrlActivity" />
</activity>
<activity android:name=".SetupActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="Setup">
<intent-filter>
<action android:name="de.hirtenstrasse.michael.lnkshortener.SetupActivity" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>

</manifest>
Oops, something went wrong.

0 comments on commit e419b2f

Please sign in to comment.
You can’t perform that action at this time.