kaegfakuro #27

Closed a-matsumoto wants to merge 4 commits into nitta-lab-2018:master from nitta-lab-2018:new

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          app/build.gradle
             minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    buildToolsVersion '27.0.3'
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '27.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }

                Ignore Space
               Show notes
              View
            
          
          16 ■■■■■
          app/src/main/AndroidManifest.xml
             </intent-filter>
        </activity>
 
 
        <activity android:name=".cactusClient.tests.SampleActivity"
        android:label="@string/app_name"
        android:screenOrientation="landscape">
        <intent-filter>
        <action android:name="android.intent.action.MAIN" />
        <category android:name="android.intent.category.LAUNCHER" />
        </intent-filter>
        </activity>
        <!--<activity android:name=".cactusClient.tests.SampleActivity"-->
        <!--android:label="@string/app_name"-->
        <!--android:screenOrientation="landscape">-->
        <!--<intent-filter>-->
        <!--<action android:name="android.intent.action.MAIN" />-->
        <!--<category android:name="android.intent.category.LAUNCHER" />-->
        <!--</intent-filter>-->
        <!--</activity>-->
 
 
    </application>
             </intent-filter>
         </activity>
+        <activity android:name=".cactusClient.tests.SampleActivity"
+        android:label="@string/app_name"
+        android:screenOrientation="landscape">
+        <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+        </activity>
+        <!--<activity android:name=".cactusClient.tests.SampleActivity"-->
+        <!--android:label="@string/app_name"-->
+        <!--android:screenOrientation="landscape">-->
+        <!--<intent-filter>-->
+        <!--<action android:name="android.intent.action.MAIN" />-->
+        <!--<category android:name="android.intent.category.LAUNCHER" />-->
+        <!--</intent-filter>-->
+        <!--</activity>-->
     </application>

                Ignore Space
               Show notes
              View
            
          
          14 ■■■■■
          app/src/main/res/layout/characters_fragment.xml
     android:layout_width="match_parent"
    android:layout_height="match_parent">
 
    <Button
        android:id="@+id/button"
        android:id="@+id/NOBITA"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginLeft="55dp"
        android:layout_marginStart="55dp"
        android:text="Jyaian"
        app:layout_constraintBaseline_toBaselineOf="@+id/button2"
        app:layout_constraintStart_toEndOf="@+id/button2" />
        app:layout_constraintBaseline_toBaselineOf="@+id/DARAEMON"
        app:layout_constraintStart_toEndOf="@+id/DARAEMON" />
 
    <Button
        android:id="@+id/button3"
        android:id="@+id/JYAIAN"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginLeft="58dp"
        android:layout_marginStart="58dp"
        android:text="DORAEMON"
        app:layout_constraintBaseline_toBaselineOf="@+id/button"
        app:layout_constraintStart_toEndOf="@+id/button" />
        app:layout_constraintBaseline_toBaselineOf="@+id/NOBITA"
        app:layout_constraintStart_toEndOf="@+id/NOBITA" />
 
    <Button
        android:id="@+id/button2"
        android:id="@+id/DARAEMON"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginLeft="25dp"
        android:layout_marginStart="25dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <Button
+        android:id="@+id/button"
+        android:id="@+id/NOBITA"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dp"
         android:layout_marginStart="55dp"
         android:text="Jyaian"
+        app:layout_constraintBaseline_toBaselineOf="@+id/button2"
+        app:layout_constraintStart_toEndOf="@+id/button2" />
+        app:layout_constraintBaseline_toBaselineOf="@+id/DARAEMON"
+        app:layout_constraintStart_toEndOf="@+id/DARAEMON" />
     <Button
+        android:id="@+id/button3"
+        android:id="@+id/JYAIAN"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="58dp"
         android:layout_marginStart="58dp"
         android:text="DORAEMON"
+        app:layout_constraintBaseline_toBaselineOf="@+id/button"
+        app:layout_constraintStart_toEndOf="@+id/button" />
+        app:layout_constraintBaseline_toBaselineOf="@+id/NOBITA"
+        app:layout_constraintStart_toEndOf="@+id/NOBITA" />
     <Button
+        android:id="@+id/button2"
+        android:id="@+id/DARAEMON"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="25dp"
         android:layout_marginStart="25dp"

Ignore Space Show notes View app/src/main/res/layout/test_activity.xml