Merge branch 'develop' into 'master'

Develop See merge request namibsun/android/bundesliga-tippspiel-android!2
namboy94 · Oct 5, 2018 · d0d9bc8 · d0d9bc8
2 parents f3064f1 + a0475f0
commit d0d9bc8
Show file tree

Hide file tree

Showing 51 changed files with 2,791 additions and 1,288 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+V 1.2.0:
+  - No longer requires users to log in each time
+  - Uses new internal model for API calls
 V 1.1.0:
   - Now uses V2 of the API
 V 1.0.5:

diff --git a/CHANGELOG-de-DE b/CHANGELOG-de-DE
@@ -1,3 +1,6 @@
+V 1.2.0:
+  - Nutzer müssen nicht länger jedes Mal sich neu einloggen
+  - Verwendet neues internes Model zur API Nutzung
 V 1.1.0:
   - Verwendet nun V2 der API
 V 1.0.5:

diff --git a/app/build.gradle b/app/build.gradle
@@ -40,16 +40,19 @@ android {
     packagingOptions {
         exclude 'META-INF/*'
     }
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
     api "com.android.support:appcompat-v7:27.1.1"
     api "com.android.support:support-v4:27.1.1"
     api "com.android.support:cardview-v7:27.1.1"
     api "org.jetbrains.anko:anko-commons:0.10.5"
-    api 'com.google.code.gson:gson:2.8.5'
+    api "com.google.code.gson:gson:2.8.5"
     api "com.squareup.okhttp3:okhttp:3.10.0"
-    testImplementation 'org.json:json:20180130'
+    testImplementation "org.json:json:20180130"
     // api project(':lib')
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,17 +28,17 @@ along with bundesliga-tippspiel-android.  If not, see <http://www.gnu.org/licens
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".LoginActivity"
+            android:name=".activities.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".BetActivity" android:configChanges="orientation|screenSize"/>
-        <activity android:name=".LeaderboardActivity" android:configChanges="orientation|screenSize"/>
-        <activity android:name=".SingleMatchActivity" android:configChanges="orientation|screenSize"/>
+        <activity android:name=".activities.BetActivity" android:configChanges="orientation|screenSize"/>
+        <activity android:name=".activities.LeaderboardActivity" android:configChanges="orientation|screenSize"/>
+        <activity android:name=".activities.MatchActivity" android:configChanges="orientation|screenSize"/>
 
     </application>
 

diff --git a/app/src/main/kotlin/net/namibsun/hktipp/LoginActivity.kt b/app/src/main/kotlin/net/namibsun/hktipp/LoginActivity.kt