Browse Source

Commit uncommitted changes

master
Paul Schaub 8 months ago
parent
commit
e9647acf49
No known key found for this signature in database GPG Key ID: 62BEE9264BF17311
7 changed files with 23 additions and 23 deletions
  1. BIN
      .idea/caches/build_file_checksums.ser
  2. +1
    -1
      .idea/misc.xml
  3. +1
    -0
      .idea/modules.xml
  4. +17
    -18
      mobile/build.gradle
  5. +2
    -2
      mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java
  6. +1
    -1
      mobile/src/main/java/de/vanitasvitae/slam/util/AbstractTextWatcher.java
  7. +1
    -1
      mobile/src/main/java/de/vanitasvitae/slam/util/EditorActionDoneListener.java

BIN
.idea/caches/build_file_checksums.ser View File


+ 1
- 1
.idea/misc.xml View File

@@ -24,7 +24,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">


+ 1
- 0
.idea/modules.xml View File

@@ -3,6 +3,7 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/SLAM.iml" filepath="$PROJECT_DIR$/SLAM.iml" />
<module fileurl="file://$PROJECT_DIR$/Slam-Android.iml" filepath="$PROJECT_DIR$/Slam-Android.iml" />
<module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" />
</modules>
</component>

+ 17
- 18
mobile/build.gradle View File

@@ -19,34 +19,33 @@ android {
}

dependencies {
//implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:support-v4:27.0.2'
implementation 'com.android.support:support-v13:27.0.2'
implementation 'com.android.support:cardview-v7:27.0.2'
implementation 'com.android.support:recyclerview-v7:27.0.2'
implementation 'com.android.support:support-emoji:27.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:support-v13:27.1.1'
implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:support-emoji:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'

// The holy ButterKnife \o/
compile 'com.jakewharton:butterknife:8.8.1'
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

// External UI
compile 'de.hdodenhof:circleimageview:2.0.0'
implementation 'de.hdodenhof:circleimageview:2.0.0'

// Smack
compile "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
compile "org.igniterealtime.smack:smack-experimental:$smackVersion"
implementation "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
implementation "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
implementation "org.igniterealtime.smack:smack-tcp:$smackVersion"
implementation "org.igniterealtime.smack:smack-experimental:$smackVersion"

// SQLCipher
compile 'net.zetetic:android-database-sqlcipher:3.5.9@aar'
implementation 'net.zetetic:android-database-sqlcipher:3.5.9@aar'

// Test stuff
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}

+ 2
- 2
mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java View File

@@ -38,8 +38,8 @@ import android.widget.Toast;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.vanitasvitae.slam.AbstractTextWatcher;
import de.vanitasvitae.slam.EditorActionDoneListener;
import de.vanitasvitae.slam.util.AbstractTextWatcher;
import de.vanitasvitae.slam.util.EditorActionDoneListener;
import de.vanitasvitae.slam.R;
import de.vanitasvitae.slam.mvp.PresenterFactory;
import de.vanitasvitae.slam.mvp.view.abstr.ThemedAppCompatActivity;


mobile/src/main/java/de/vanitasvitae/slam/AbstractTextWatcher.java → mobile/src/main/java/de/vanitasvitae/slam/util/AbstractTextWatcher.java View File

@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package de.vanitasvitae.slam;
package de.vanitasvitae.slam.util;

import android.text.Editable;
import android.text.TextWatcher;

mobile/src/main/java/de/vanitasvitae/slam/EditorActionDoneListener.java → mobile/src/main/java/de/vanitasvitae/slam/util/EditorActionDoneListener.java View File

@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package de.vanitasvitae.slam;
package de.vanitasvitae.slam.util;

import android.view.KeyEvent;
import android.view.inputmethod.EditorInfo;

Loading…
Cancel
Save