Merge branch 'dev' of https://github.com/fga-gpp-mds/2018.1_Nexte int…

…o feature/121-2
fga-eps-mds · May 27, 2018 · 33a5a29 · 33a5a29
2 parents 1607611 + 1cc8132
commit 33a5a29
Show file tree

Hide file tree

Showing 54 changed files with 649 additions and 588 deletions.
diff --git a/project/app/build.gradle b/project/app/build.gradle
@@ -27,10 +27,10 @@ android {
     compileSdkVersion 26
     defaultConfig {
         applicationId "com.nexte.nexte"
-        minSdkVersion 22
+        minSdkVersion 18
         targetSdkVersion 26
-        versionCode 5
-        versionName "0.5"
+        versionCode 6
+        versionName "0.6"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/project/app/src/androidTest/java/com/nexte/nexte/CommentsViewTest.java b/project/app/src/androidTest/java/com/nexte/nexte/CommentsViewTest.java
diff --git a/project/app/src/main/AndroidManifest.xml b/project/app/src/main/AndroidManifest.xml
@@ -68,7 +68,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"/>
         <activity
-            android:name=".CommentsScene.CommentsView"
+            android:name=".CommentsScene.CommentsFragment"
             android:label="CommentsActivity"
             android:screenOrientation="portrait" />
         <activity

diff --git a/project/app/src/main/check_comments-web.png b/project/app/src/main/check_comments-web.png
diff --git a/project/app/src/main/java/com/nexte/nexte/ChallengeScene/ChallengeView.kt b/project/app/src/main/java/com/nexte/nexte/ChallengeScene/ChallengeView.kt
@@ -15,6 +15,7 @@ import kotlinx.android.synthetic.main.columns_challenged.view.*
 import android.app.AlertDialog
 import android.support.v4.app.FragmentStatePagerAdapter
 import android.support.v4.view.PagerAdapter
+import android.support.v4.view.ViewPager
 import android.widget.Button
 import android.widget.TextView
 import com.nexte.nexte.MatchScene.MatchFragment
@@ -87,8 +88,9 @@ class ChallengeView : AppCompatActivity(), ChallengeDisplayLogic {
         super.onCreate(savedInstanceState)
         this.setContentView(R.layout.activity_challenger)
         this.setupChallengeScene()
-        viewpager.adapter = ViewPagerAdapter(supportFragmentManager, this)
-        tabs.setupWithViewPager(viewpager)
+        val viewPager: ViewPager = findViewById(R.id.challengerviewpager)
+        viewPager.adapter = ViewPagerAdapter(supportFragmentManager, this)
+        tabs.setupWithViewPager(viewPager)
     }
 
     /**
@@ -145,7 +147,8 @@ class ChallengeView : AppCompatActivity(), ChallengeDisplayLogic {
             this.message?.text = viewModel.matchMessage
             this.message?.visibility = View.VISIBLE
             this.sendChallengeButton?.isEnabled = false
-            this.viewpager.adapter.notifyDataSetChanged()
+            val viewPager: ViewPager = findViewById(R.id.challengerviewpager)
+            viewPager.adapter.notifyDataSetChanged()
         }